summaryrefslogtreecommitdiffstats
path: root/solaris/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'solaris/Makefile.am')
-rw-r--r--solaris/Makefile.am4
1 files changed, 0 insertions, 4 deletions
diff --git a/solaris/Makefile.am b/solaris/Makefile.am
index e2cb4df6..674f4ebf 100644
--- a/solaris/Makefile.am
+++ b/solaris/Makefile.am
@@ -1,9 +1,5 @@
# Solaris packages automake file
-<<<<<<< HEAD:solaris/Makefile.am
-# $Id: Makefile.am,v 1.9 2008/01/13 18:52:15 paul Exp $
-=======
# $Id$
->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:solaris/Makefile.am
# XXX This file uses GNU make extensions.