Fix merge conflict

ps2 · ps2 · commit 2bf788247dfa · 2019-01-26T13:01:14.000-06:00
diff --git a/LoopUI/Info.plist b/LoopUI/Info.plist
@@ -17,11 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-<<<<<<< HEAD
 	<string>1.9.4</string>
-=======
-	<string>1.9.3</string>
->>>>>>> master
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
