mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 07:51:11 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Commit: 4ace56d488
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
This commit is contained in:
@@ -21,7 +21,7 @@ update_file()
|
||||
fi
|
||||
echo "update $FILE_IMAGE"
|
||||
rm -f $FILE_IMAGE
|
||||
cp $FILE_NEW $FILE_IMAGE
|
||||
cp -d $FILE_NEW $FILE_IMAGE
|
||||
fi
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user