[Lunar-commits] <moonbase> something i forgot to fix

[Samuel Verstraete]

commit 9a4ca2aa7c48e9bac5c9b337ba95b178c4c04452
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Sun Oct 4 22:35:24 2009 +0200

    something i forgot to fix
---
 libs/glibc/DETAILS |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index d597b4c..40ea85e 100644
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -17,10 +17,7 @@
          ENTERED=20010922
          UPDATED=20090923
            SHORT="C library for use with GNU/Hurd and GNU/Linux"
-<<<<<<< HEAD
-=======
            PSAFE=no
->>>>>>> master
 
 cat << EOF
 glibc - Library for use with GNU/Hurd and GNU/Linux.