Merge public master

apptentive · May 7, 2018 · b3e2e53 · b3e2e53
2 parents 00bb088 + c48610c
commit b3e2e53
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Apptentive/Apptentive.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Apptentive/Apptentive.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Apptentive/Apptentive/Info.plist b/Apptentive/Apptentive/Info.plist
@@ -15,7 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
+<<<<<<< HEAD
 	<string>5.0.4</string>
+=======
+	<string>5.0.3</string>
+>>>>>>> c48610c1c115b1ef5b34fddf96a13972ec667e19
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>