From 7c4b37f3663e2853374aab939e3d52fe7926626c Mon Sep 17 00:00:00 2001
From: moul <ma.azimi@laposte.net>
Date: Tue, 21 Oct 2014 18:47:15 +0200
Subject: [PATCH] enh

---
 README.md      |  4 ++--
 manifest.json  | 10 ----------
 scripts/remove | 15 ++-------------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index c526be6..bec3d2d 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 YaCy package for YunoHost
 ----------------------
 
-* [http://yacy.net](YaCy web site)
+* [YaCy web site](http://yacy.net)
 
-* [https://yunohost.org/](YunoHost web site]
+* [YunoHost web site](https://yunohost.org/)
 
 * Package not ready
 
diff --git a/manifest.json b/manifest.json
index 1b047ee..7cff4ca 100644
--- a/manifest.json
+++ b/manifest.json
@@ -20,26 +20,16 @@
             {
                 "name": "domain",
                 "ask": {
-<<<<<<< HEAD
                     "en": "Choose a domain for YaCy",
                     "fr": "Choisisez un nom de domaine sur lequel installer YaCy"
-=======
-                    "en": "Choose a domain for YaCy"
-                    "fr": "Choisi un nom de domaine pour YaCy"
->>>>>>> 26d191cc215b468d1303bc3f4f3b54262d1ede09
                 },
                 "example": "domain.org"
             },
             {
                 "name": "path",
                 "ask": {
-<<<<<<< HEAD
                     "en": "Choose a path for YaCy",
                     "fr": "Choisisez une adresse sur laquelle installer YaCy"
-=======
-                    "en": "Choose a path for YaCy"
-                    "fr": "Choisi une adresse pour YaCy"
->>>>>>> 26d191cc215b468d1303bc3f4f3b54262d1ede09
                 },
                 "example": "/yacy",
                 "default": "/yacy"
diff --git a/scripts/remove b/scripts/remove
index 9e0f946..18d6da1 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,22 +1,11 @@
 #!/bin/bash
 
-<<<<<<< HEAD
-# Remove Debian official paquage
-sudo apt-get remove yacy
-
-# Remove YaCy service to the YunoHost monitoring
-sudo yunohost service remove yacy --log /var/log/yacy/yacy00.log
-
-sudo service nginx reload
-sudo yunohost app ssowatconf 
-=======
-#Remove official Debian package
+# Remove Debian official
 sudo apt-get remove yacy -y -qq
 
-#Remove YaCy service to YunoHost monitoring
+# Remove YaCy service to YunoHost monitoring
 sudo yunohost service remove yacy
 
 #Reload Nginx and regenerate SSOwat conf
 sudo service nginx reload
 sudo yunohost app ssowatconf
->>>>>>> 26d191cc215b468d1303bc3f4f3b54262d1ede09