readme master

Author: joscha

README.md

@@ -90,11 +90,7 @@ To be compatible with existing css files (if not in CSS Module mode):
 |**`camelCase`**|`false`|Export Classnames in CamelCase|
 |**`importLoaders`**|`0`|Number of loaders applied before CSS loader|
 
-<<<<<<< 1e4deb5d4e7bfc72ec436b518e132276d2bc1590
 The following webpack config can load CSS files, embed small PNG/JPG/GIF/SVG images as well as fonts as [Data URLs](https://tools.ietf.org/html/rfc2397) and copy larger files to the output directory.
-=======
-This webpack config can load CSS files, embed small png images as Data URLs and JPG images as files.
->>>>>>> readme
 
 **webpack.config.js**
 ```js
@@ -106,20 +102,11 @@ module.exports = {
         use: [ 'style-loader', 'css-loader' ]
       },
       {
-<<<<<<< 1e4deb5d4e7bfc72ec436b518e132276d2bc1590
         test: /\.(png|jpg|gif|svg|eot|ttf|woff|woff2)$/,
         loader: 'url-loader',
         options: {
           limit: 10000
         }
-=======
-        test: /\.png$/,
-        use: { loader: 'url-loader', options: { limit: 100000 } },
-      },
-      {
-        test: /\.jpg$/,
-        use: [ 'file-loader' ]
->>>>>>> readme
       }
     ]
   }
@@ -407,17 +394,12 @@ By default, the exported JSON keys mirror the class names. If you want to cameli
 import { className } from 'file.css';
 ```
 
-<<<<<<< 1e4deb5d4e7bfc72ec436b518e132276d2bc1590
 <h2 align="center">Maintainers</h2>
-=======
-<h2 align="center">Maintainer</h2>
->>>>>>> readme
 
 <table>
   <tbody>
     <tr>
       <td align="center">
-<<<<<<< 1e4deb5d4e7bfc72ec436b518e132276d2bc1590
         <img width="150" height="150"
         src="https://avatars3.githubusercontent.com/u/166921?v=3&s=150">
         </br>
@@ -442,13 +424,6 @@ import { className } from 'file.css';
         <a href="https://github.com/TheLarkInn">Sean Larkin</a>
       </td>
     </tr>
-=======
-        <img width="150" height="150" src="https://github.com/sokra.png?s=150">
-        <br>
-        <a href="https://github.com/sokra">Tobias Koppers</a>
-      </td>
-    <tr>
->>>>>>> readme
   <tbody>
 </table>