From 03074519069383688f69ee7f0dc619b067d9917f Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Mon, 24 Jul 2017 01:15:15 +0200
Subject: Add libicu-dev and libidn11-dev

---
 scripts/backup | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'scripts/backup')

diff --git a/scripts/backup b/scripts/backup
index 2e26381..e4a5bba 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -43,9 +43,5 @@ sudo su - postgres <<COMMANDS
 pg_dump --role=mastodon -U postgres --no-password mastodon_production > mastodon_db.sql
 COMMANDS
 ynh_backup "/var/lib/postgresql/${app}_db.sql" "${app}_db.sql"
-<<<<<<< HEAD
-#rm /var/lib/postgresql/mastodon_db.sql
-=======
 # Fix backup fail on yunohost 2.6
 #ynh_secure_remove /var/lib/postgresql/mastodon_db.sql
->>>>>>> refs/remotes/YunoHost-Apps/master
-- 
cgit v1.2.3-70-g09d2