summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/gindent/Makefile10
1 files changed, 0 insertions, 10 deletions
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index a61e1e08a17e..494df9e826d3 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -7,17 +7,7 @@
#
PORTNAME= gindent
-<<<<<<< Makefile
-<<<<<<< Makefile
PORTVERSION= 2.2.9
-PORTREVISION= 0
-=======
-PORTVERSION= 2.2.8a
-PORTREVISION= 3
->>>>>>> 1.29
-=======
-PORTVERSION= 2.2.9
->>>>>>> 1.30
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= indent