aboutsummaryrefslogtreecommitdiff
path: root/devel/gindent/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gindent/Makefile')
-rw-r--r--devel/gindent/Makefile10
1 files changed, 10 insertions, 0 deletions
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 494df9e826d3..a61e1e08a17e 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -7,7 +7,17 @@
#
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