diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2005-04-12 04:22:45 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2005-04-12 04:22:45 +0000 |
| commit | 3f9e29f7d8854fa978ee50cb2bb96083860f474e (patch) | |
| tree | a4d2b8f030090a3657fc70a430deff9e5d3d3bc2 /devel/gindent | |
| parent | c3d8037aeba75366ed06e02fbc981e15b46e7d0a (diff) | |
| download | ports-3f9e29f7d8854fa978ee50cb2bb96083860f474e.tar.gz ports-3f9e29f7d8854fa978ee50cb2bb96083860f474e.zip | |
*sigh* This is why even cursory inspections of diffs is a good
idea. Remove the re-added CVS conflict lines.
Notes
Notes:
svn path=/head/; revision=133117
Diffstat (limited to 'devel/gindent')
| -rw-r--r-- | devel/gindent/Makefile | 10 |
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 |