Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Eliza Sapir committed Feb 12, 2017
2 parents b4fe244 + 09f5d0b commit 6d43e86
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions Example/PlayKit/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.1.12</string>
<key>CFBundleGetInfoString</key>
<string></string>
<key>LSApplicationCategoryType</key>
<string></string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit 6d43e86

Please sign in to comment.