From 8a2600e22377c46d494b804bf3444895e4651edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Sun, 29 Jun 2014 22:09:22 +0200
Subject: [PATCH] Fixed unmerged changes in base-files

---
 helpers/make-base-files | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/helpers/make-base-files b/helpers/make-base-files
index 6b5cc089..1ea3645c 100644
--- a/helpers/make-base-files
+++ b/helpers/make-base-files
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 
 . ./config
 
@@ -93,9 +93,6 @@ cat > etc/lsb-release <<EOF
 DISTRIB_ID=Trisquel
 DISTRIB_RELEASE=$REVISION
 DISTRIB_CODENAME=$CODENAME
-<<<<<<< HEAD
-DISTRIB_DESCRIPTION="Trisquel $REVISION"
-=======
 DISTRIB_DESCRIPTION="Trisquel GNU/Linux $REVISION, $CODENAMECAPS"
 EOF
 
@@ -109,7 +106,6 @@ VERSION_ID="$REVISION"
 HOME_URL="https://trisquel.info/"
 SUPPORT_URL="https://trisquel.info/wiki"
 BUG_REPORT_URL="https://trisquel.info/project/issues"
->>>>>>> d34910d... Updated base-files, fixes #11841
 EOF
 
 cat << EOF > origins/trisquel
-- 
GitLab