[Lunar-commits] <moonbase> gcc: fix DETAILS file

[Zachary McGrew]

commit 490419ed39821318cadb0943dfb4d2426ee2dcf8
Author: Zachary McGrew <zmcgrew at lunar-linux.org>
Date:   Wed Dec 2 16:16:51 2009 -0800

    gcc: fix DETAILS file
---
 compilers/gcc/DETAILS |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/compilers/gcc/DETAILS b/compilers/gcc/DETAILS
index 930221a..a6f29fe 100644
--- a/compilers/gcc/DETAILS
+++ b/compilers/gcc/DETAILS
@@ -7,12 +7,8 @@
       SOURCE_VFY=sha1:6cf7d9204ff3e1a09f4f12b1372cd4129ab7f080
         WEB_SITE=http://gcc.gnu.org
          ENTERED=20020628
-<<<<<<< HEAD
          UPDATED=20091015
            PSAFE=no
-=======
-         UPDATED=20090923
->>>>>>> f9719e151c2b578371abd491a03697ebbef489e1
            SHORT="GNU compiler collection"
 
 cat << EOF