toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflict

Browse source
This commit is contained in:
Elias Nahum 2018-07-03 13:14:03 -04:00
parent d19fca53d7
commit be637c789c
No known key found for this signature in database
GPG key ID: E038DB71E0B61702
4 changed files with 0 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ios/Mattermost.xcodeproj/project.pbxproj
View file

@ -2532,11 +2532,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
<<<<<<< HEAD
CURRENT_PROJECT_VERSION = 118;
=======
CURRENT_PROJECT_VERSION = 119;
>>>>>>> release-1.9
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;
@ -2586,11 +2582,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
<<<<<<< HEAD
CURRENT_PROJECT_VERSION = 118;
=======
CURRENT_PROJECT_VERSION = 119;
>>>>>>> release-1.9
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;

8
ios/Mattermost/Info.plist
View file

@ -19,11 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<<<<<<< HEAD
<string>1.10.0</string>
=======
<string>1.9.3</string>
>>>>>>> release-1.9
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -38,11 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<<<<<<< HEAD
<string>118</string>
=======
<string>119</string>
>>>>>>> release-1.9
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

6
ios/MattermostShare/Info.plist
View file

@ -21,15 +21,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<<<<<<< HEAD
<string>1.10.0</string>
<key>CFBundleVersion</key>
<string>118</string>
=======
<string>1.9.3</string>
<key>CFBundleVersion</key>
<string>119</string>
>>>>>>> release-1.9
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>

8
ios/MattermostTests/Info.plist
View file

@ -15,18 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<<<<<<< HEAD
<string>1.10.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>118</string>
=======
<string>1.9.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>119</string>
>>>>>>> release-1.9
</dict>
</plist>