Merge pull request #62 from WatchFriends/MichielDev

Conflict Failed Resolve Resolved
WatchFriends · Oct 24, 2016 · cf0b00c · cf0b00c
2 parents 65c570f + 0ec5041
commit cf0b00c
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/WatchFriends/app/src/main/res/values/strings.xml b/WatchFriends/app/src/main/res/values/strings.xml
@@ -1,13 +1,10 @@
 <resources>
-<<<<<<< HEAD
-    <string name="app_name">Watchfriends</string>
     <string name="title_activity_main">MainActivity</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
     <string name="action_settings">Settings</string>
-=======
+
     <string name="app_name">WatchFriends</string>
->>>>>>> refs/remotes/origin/master
 </resources>