try to fix merge conflicts

2018-12-09 16:40:48 +01:00
parent 76ff1745b5 7d10fbffec
commit 26abfa578f
26 changed files with 313 additions and 126 deletions
@@ -72,6 +72,7 @@
 		<string>Prompt-Thin.ttf</string>
 		<string>fontello.ttf</string>
 		<string>drip-icon-font.ttf</string>
+<<<<<<< HEAD
 		<string>Dosis-Bold.ttf</string>
 		<string>Dosis-Book.ttf</string>
 		<string>Dosis-ExtraBold.ttf</string>
@@ -79,6 +80,10 @@
 		<string>Dosis-Light.ttf</string>
 		<string>Dosis-Medium.ttf</string>
 		<string>Dosis-SemiBold.ttf</string>
+=======
+		<string>drip-home-icon-font.ttf</string>
+		<string>drip-home-icons.ttf</string>
+>>>>>>> master
 	</array>
 </dict>
 </plist>