Skip to content
Snippets Groups Projects
Commit 8a2600e2 authored by Ruben Rodriguez's avatar Ruben Rodriguez
Browse files

Fixed unmerged changes in base-files

parent 938dc3d3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 5 deletions
helpers/make-base-files
+ 1
− 5
View file @ 8a2600e2
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=2 VERSION=3
. ./config . ./config
...@@ -93,9 +93,6 @@ cat > etc/lsb-release <<EOF ...@@ -93,9 +93,6 @@ cat > etc/lsb-release <<EOF
DISTRIB_ID=Trisquel DISTRIB_ID=Trisquel
DISTRIB_RELEASE=$REVISION DISTRIB_RELEASE=$REVISION
DISTRIB_CODENAME=$CODENAME DISTRIB_CODENAME=$CODENAME
<<<<<<< HEAD
DISTRIB_DESCRIPTION="Trisquel $REVISION"
=======
DISTRIB_DESCRIPTION="Trisquel GNU/Linux $REVISION, $CODENAMECAPS" DISTRIB_DESCRIPTION="Trisquel GNU/Linux $REVISION, $CODENAMECAPS"
EOF EOF
...@@ -109,7 +106,6 @@ VERSION_ID="$REVISION" ...@@ -109,7 +106,6 @@ VERSION_ID="$REVISION"
HOME_URL="https://trisquel.info/" HOME_URL="https://trisquel.info/"
SUPPORT_URL="https://trisquel.info/wiki" SUPPORT_URL="https://trisquel.info/wiki"
BUG_REPORT_URL="https://trisquel.info/project/issues" BUG_REPORT_URL="https://trisquel.info/project/issues"
>>>>>>> d34910d... Updated base-files, fixes #11841
EOF EOF
cat << EOF > origins/trisquel cat << EOF > origins/trisquel
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment