Merge branch 'master' of https://github.com/bigyihsuan/complicated-re…

…cipes # Conflicts: # prototypes/items/intermediates/misc-intermediates.lua
bigyihsuan · Apr 30, 2016 · 366a0b3 · 366a0b3
2 parents cc684db + 7ff0713
commit 366a0b3
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/prototypes/items/intermediates/misc-intermediates.lua b/prototypes/items/intermediates/misc-intermediates.lua
@@ -23,19 +23,11 @@ data:extend({
 	name = 'compressed-solid-fuel',
 	icon = '__complicated-recipes__/graphics/intermediates/compressed-solid-fuel.png',
 	subgroup = 'raw-resource',
-<<<<<<< HEAD
-<<<<<<< HEAD:complicated-recipes_1.0.0/prototypes/items/intermediates/misc-intermediates.lua
-	order = 'c[compressed-solid-fuel]' --vanilla tabs
-=======
-	order = 'c[compressed-solid-fuel]', --vanilla tabs
->>>>>>> refs/remotes/origin/pr/1:prototypes/items/intermediates/misc-intermediates.lua
-=======
 <<<<<<< HEAD:prototypes/items/intermediates/misc-intermediates.lua
 	order = 'c[compressed-solid-fuel]', --vanilla tabs
 =======
 	order = 'c[compressed-solid-fuel]' --vanilla tabs
 >>>>>>> refs/remotes/origin/master:complicated-recipes_1.0.0/prototypes/items/intermediates/misc-intermediates.lua
->>>>>>> refs/remotes/origin/pr/1
 	fuel_value = '250MJ',
 	stack_size = 50
 }