Merge branch 'master' of https://github.com/Tomas-M/linux-live

Conflicts: build
2012-09-01 10:12:09 +01:00 · 2012-09-01 10:12:09 +01:00 · 1337047073
parent 7c41aef31e 82b6898241
commit 1337047073
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -13,4 +13,4 @@ cd $CHANGEDIR
 # only root can continue, because only root can read all files from your system
 allow_only_root

-# ouch
+# ouch