haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge markers that @humdingerb forgot to remove.

Browse Source
This commit is contained in:
Augustin Cavalier
2015-08-04 15:35:17 -04:00
parent 1ac39b83d1
commit fabb448824
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app-text/dos2unix/dos2unix-1.0.1.recipe
View File

@@ -1,16 +1,7 @@
<<<<<<< HEAD
SUMMARY="dos2unix and unix2dos end of line file convertors"
DESCRIPTION="
DOS/Windows like to put CR/LF at the end of lines whereas UNIX like to have \
just LF. Dos2unix and unix2dos are simple parser/converter command line \
programs to convert between the two formats.
"
=======
SUMMARY="Convertor between DOS and Unix end-of-line"
SUMMARY="Converter between DOS and Unix end-of-line delimiters"
DESCRIPTION="DOS/Windows like to put CR/LF at the end of lines whereas UNIX like \
to have just LF. Dos2unix and unix2dos are simple parser/converter command line \
programs to convert between the two formats."
>>>>>>> De-lint recipes.
to have just LF. Dos2unix and unix2dos are simple parser/converter command line \
programs to convert between the two formats."
HOMEPAGE="http://github.com/puckipedia/dos2unix"
COPYRIGHT="Public Domain"
LICENSE="Public Domain"

4
media-libs/giflib/giflib-5.1.1.recipe
View File

@@ -53,10 +53,6 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
<<<<<<< HEAD
=======
>>>>>>> De-lint recipes.
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix