From 34b3db4c185bed60a64462c7a97ac88e6dcf87b4 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Sat, 9 Mar 2019 13:02:31 +0100
Subject: [PATCH] Corrections after conflict merge

---
 README.md       |  2 --
 manifest.json   | 26 +++++++++++++-------------
 scripts/install |  1 -
 scripts/upgrade |  1 -
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 7aeb532..c6d5364 100644
--- a/README.md
+++ b/README.md
@@ -37,8 +37,6 @@ Each user can add a remote carddav server from their own parameters interface.
 - If you use baikal, the CardDav address is: https://DOMAIN.TLD/baikal/card.php/addressbooks/USER/default/
 - If you use NextCloud, the CardDav address is: https://DOMAIN.TLD/nextcloud/remote.php/carddav/addressbooks/USER/contacts
 
-Rainloop saves your PGP private keys in the browser storage. This means that you will loose your private keys if you clear your browser storage (e.g., private browsing, different computer...). This packages integrates [PGPback by chtixof](https://github.com/chtixof/pgpback_ynh) so you can store your PGP private keys on the server securely. Go to **http://DOMAIN.TLD/rainloop/pgpback** to backup your PGP keys on the server or restore them.
-
 ## Documentation
 
  * Official documentation: https://www.rainloop.net/docs/configuration/
diff --git a/manifest.json b/manifest.json
index e47b5fc..a884fb3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -51,19 +51,19 @@
 				},
 				"default": false
 			},
-            {
-                "name": "password",
-                "type": "password",
-                "ask": {
-                    "en": "Set the administrator password",
-                    "fr": "Définissez le mot de passe administrateur"
-                },
-                "help": {
-                    "en": "Use the help field to add an information for the admin about this question.",
-                    "fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question."
-                },
-                "example": "Choose a password"
-            },
+			{
+				"name": "password",
+				"type": "password",
+				"ask": {
+					"en": "Set the administrator password",
+					"fr": "Définissez le mot de passe administrateur"
+				},
+				"help": {
+					"en": "Use the help field to add an information for the admin about this question.",
+					"fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question."
+				},
+				"example": "Choose a password"
+			},
 			{
 				"name": "ldap",
 				"type": "boolean",
diff --git a/scripts/install b/scripts/install
index 9fe7f63..c843404 100644
--- a/scripts/install
+++ b/scripts/install
@@ -166,7 +166,6 @@ else
 	ynh_replace_string "__ROOTTOCHANGE__" "$path_url" "$final_path/index.php"
 fi
 
-
 # Install PGPback by chtixof to allow users to backup/restore their PGP private keys on the server
 cp -rf ../sources/pgpback "$final_path/"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index b441b6a..0502049 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -121,7 +121,6 @@ else
 	ynh_replace_string "__ROOTTOCHANGE__" "$path_url" "$final_path/index.php"
 fi
 
-
 # Install PGPback by chtixof to allow users to backup/restore their PGP private keys on the server
 cp -rf ../sources/pgpback "$final_path/"