Resolved conflict

2014-09-29 23:36:53 +02:00 · 2014-09-29 23:36:53 +02:00 · 39b464fb2f
commit 39b464fb2f
parent a21268a7b5 caffaef835
1 changed files with 4 additions and 0 deletions
--- a/src/main/java/appeng/container/AEBaseContainer.java
+++ b/src/main/java/appeng/container/AEBaseContainer.java
@ -573,7 +573,11 @@ public abstract class AEBaseContainer extends Container
 			{
 				ICrafting icrafting = (ICrafting) crafter;

+<<<<<<< HEAD
 				for (SyncData sd : syncData.values())
+=======
+				for (SyncDat sd : syncData.values())
+>>>>>>> caffaef8350df972a8fb154db7909e1911ff6bc3
 				{
 					sd.tick( icrafting );
 				}