Fixed Merge conflict

tanvidadu · tanvidadu · commit a6a30e1e77e3 · 2018-03-17T09:52:27.000+05:30
diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
@@ -92,5 +92,6 @@ public void launchPrivacyPolicy(View view) {
     public void launchFrequentlyAskedQuesions(View view) {
         Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Frequently-Asked-Questions\\"));
     }
+    
 
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -245,5 +245,6 @@
   <string name="about_rate_us"><u>Rate Us</u></string>
   <string name="about_faq">Frequently Asked Questions</string>
   <string name="welcome_skip_button">Skip Tutorial</string>
+  <string name="about_translate"><u>Translate</u></string>
 
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -92,5 +92,6 @@ public void launchPrivacyPolicy(View view) {`
`92`	`92`	`public void launchFrequentlyAskedQuesions(View view) {`
`93`	`93`	`Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Frequently-Asked-Questions\\"));`
`94`	`94`	`}`
	`95`	`+`
`95`	`96`
`96`	`97`	`}`