diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-03 23:32:09 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-03 23:32:09 +0100 |
| commit | 693a2dc99bf07aeac1865d4a48ddf2589317ac7a (patch) | |
| tree | 8bd926d3671dc9de0a72d4025aaa625a18ba51e1 /phpBB/develop/fix_files.sh | |
| parent | b68de2323d6444b4b3685a98bbcb9500a38e45cb (diff) | |
| parent | ac329275662f737f03f485107cb69412739c1afa (diff) | |
| download | forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.gz forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.bz2 forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.xz forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.zip | |
Merge branch 'develop-olympus' into develop
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
Diffstat (limited to 'phpBB/develop/fix_files.sh')
| -rwxr-xr-x | phpBB/develop/fix_files.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/develop/fix_files.sh b/phpBB/develop/fix_files.sh index 782418f504..d2207289dc 100755 --- a/phpBB/develop/fix_files.sh +++ b/phpBB/develop/fix_files.sh @@ -21,9 +21,9 @@ rm FILELIST.$$ for i in $(cat FILELIST); do if [ -f $i ]; then - sed -e s/ -//g $i > $i.tmp - mv $i.tmp $i + cat $i | tr -d '\r' > $i.tmp + mv $i.tmp $i fi done rm FILELIST + |