Browse code

Merge branch 'git-sync.sh'

Conflicts:
git-sync.sh

Fred authored on07/01/2016 23:01:45
Showing1 changed files
... ...
@@ -159,7 +159,11 @@ fi
159 159
 while read line
160 160
 do
161 161
 
162
+<<<<<<< HEAD
162 163
     # Remove comments from list file
164
+=======
165
+    # Remove comments from line
166
+>>>>>>> git-sync.sh
163 167
     line=$(echo "$line" | sed "/^\s*#/d;s/\s*#.*$//")
164 168
     
165 169
     # Skip if empty line