oops, left from merge

2015-07-05 19:30:42 +02:00
parent 3aef8d6b22
commit a7ccc52223
1 changed files with 0 additions and 1 deletions
@@ -6,7 +6,6 @@ MAINTAINER mudler <mudler@sabayonlinux.org>
 RUN echo "en_US.UTF-8 UTF-8 " >> /etc/locale.gen &&  locale-gen &&  eselect locale set en_US.utf8 && env-update && source /etc/profile
 ENV LC_ALL=en_US.UTF-8

-<<<<<<< HEAD
 # Upgrading portage
 RUN emerge --sync --quiet && layman -S && layman -a sabayon