Fix oc.json and update changelog for 3.7.1.1 :|

debian/changelog

@@ -1,9 +1,15 @@
+yunohost-admin (3.7.1.1) stable; urgency=low
+
+   - [fix] Aleks forgot to properly fix the conflicts in oc.json ~.~
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Thu, 9 Apr 2020 19:03:00  +0000
+
 yunohost-admin (3.7.1) stable; urgency=low
 
    - [fix] Misc fixes for action / config panel (#289, #282)
    - [enh] Add a note about some apps that need to be exposed to visitors for external client to work 
  
- -- Alexandre Aubin <alex.aubin@mailoo.org>  Thu, 9 April 2020 16:09:00  +0000
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Thu, 9 Apr 2020 16:09:00  +0000
 
 yunohost-admin (3.7.0.4) stable; urgency=low
 

src/locales/oc.json

@@ -463,9 +463,6 @@
     "ignore": "Ignorar",
     "ignored": "%s ignorat",
     "unignore": "Ignorar pas",
-<<<<<<< HEAD
-    "warnings": "%s avises"
-=======
     "warnings": "%s avises",
     "configuration": "Configuracion",
     "since": "dempuèi",
@@ -474,5 +471,4 @@
     "app_state_low_quality": "qualitat bassa",
     "catalog": "Catalòg",
     "others": "Autras"
->>>>>>> 1c7ae83... Translated using Weblate (Occitan)
 }