diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2005-04-11 08:42:14 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2005-04-11 08:42:14 +0000 |
| commit | 29eafbb0bcd790f481e8be73c2ed326fea74bbca (patch) | |
| tree | 69d6a0b6fa07c032107381484c54f3d32e58f713 /devel | |
| parent | Optimize USE_RC_SUBR-usage: USE_RC_SUBR=foo.sh instead of having to set (diff) | |
Remove CVS conflict lines from David's ARCH sweep.
Notes
Notes:
svn path=/head/; revision=133006
Diffstat (limited to 'devel')
| -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 |