resolve conflicts

Author: simongravelle

files/tutorial1/solution/initial.lmp

@@ -10,6 +10,7 @@ units lj
 dimension 3
 atom_style atomic
 boundary p p p
+
 # 2) System definition
 region simbox block -20 20 -20 20 -20 20
 create_box 2 simbox

files/tutorial2/.manifest

@@ -13,7 +13,10 @@ breakable.data
 # 2) support files
 CH.airebo
 
-# 3) solution files
+# 3) extra files
+unbreakable-yaml-reader.py
+
+# 4) solution files
 # only downloaded on request
 solution/unbreakable.lmp
 solution/unbreakable.data
@@ -23,6 +26,7 @@ solution/unbreakable.inc
 solution/unbreakable.png
 solution/unbreakable.dat
 solution/unbreakable-yaml-reader.py
+solution/CH.airebo
 solution/breakable.lmp
 solution/breakable.data
 solution/breakable.yaml
@@ -32,6 +36,4 @@ solution/breakable.dat
 solution/breakable-yaml-reader.py
 solution/breakable-with-tip.lmp
 
-# 4) extra files
-unbreakable-yaml-reader.py
 

files/tutorial4/.manifest

@@ -18,9 +18,6 @@ solution/parameters.inc
 solution/create.data
 solution/create.lmp
 solution/create.log
-solution/minimize.data
-solution/minimize.lmp
-solution/minimize.log
 solution/equilibrate.data
 solution/equilibrate.lmp
 solution/equilibrate.log