[Lunar-commits] <moonbase> fglrx

[Samuel]

commit 3abf8d4f0a60a55d5a996f5ef25f4a1ee5408c1c
Author: Samuel <samuel.verstraete at gmail.com>
Date:   Thu Nov 13 18:24:31 2008 +0100

    fglrx
---
 x11/fglrx/DETAILS |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/x11/fglrx/DETAILS b/x11/fglrx/DETAILS
index 473422f..d75c624 100644
--- a/x11/fglrx/DETAILS
+++ b/x11/fglrx/DETAILS
@@ -13,7 +13,6 @@
         WEB_SITE=http://ati.amd.com/
          ENTERED=20040220
          UPDATED=20081111
->>>>>>> master:x11/fglrx/DETAILS
          LICENSE="proprietary"
            SHORT="Proprietary X.org driver for the AMD ATI Radeon GPUs"
 cat << EOF