Remove light app text

2019-01-17 17:17:22 +01:00
parent 7159124158
commit d905139958
8 changed files with 19 additions and 31 deletions
@@ -72,7 +72,6 @@
 		<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>
@@ -80,10 +79,9 @@
 		<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
+		<string>Dosis-medium.ttf</string>
 	</array>
 </dict>
 </plist>