fix missed merge

Signed-off-by: Taro Matsuzawa <[email protected]>

Author: smellman

src/stylesheets/fonts.scss

@@ -1,21 +1,10 @@
 /* Generated by Glyphter (http://www.glyphter.com) on  Thu Jan 19 2017*/
 @font-face {
-<<<<<<< HEAD:src/stylesheets/fonts.scss
-  font-family: 'Redmine';
-  src: url('../fonts/Redmine.eot');
-  src: url('../fonts/Redmine.eot?#iefix') format('embedded-opentype'),
-       url('../fonts/Redmine.woff') format('woff'),
-       url('../fonts/Redmine.ttf') format('truetype'),
-       url('../fonts/Redmine.svg#Redmine') format('svg');
-  font-weight: normal;
-  font-style: normal;
-=======
     font-family: 'Redmine';
     src: url('../fonts/Redmine.woff') format('woff'),
          url('../fonts/Redmine.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
->>>>>>> f01e226debbbcf4ea9f3f19bbec11ba578ef9591:assets/stylesheets/fonts.css
 }
 [class^='gtt-icon-']:before{
 	display: inline-block;