From 12589c55dbeb3d8aba922391ca18e4506eee2085 Mon Sep 17 00:00:00 2001
From: thatsIch <badhard@arcor.de>
Date: Sun, 28 Sep 2014 12:22:03 +0200
Subject: [PATCH] Resolved conflicts

---
 src/api/java/appeng/api | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/java/appeng/api b/src/api/java/appeng/api
index 74e4e50c7..da4cad25b 160000
--- a/src/api/java/appeng/api
+++ b/src/api/java/appeng/api
@@ -1 +1 @@
-Subproject commit 74e4e50c76e812cc227bea020f3c8646eacfedb1
+Subproject commit da4cad25b5358b3139f97fe89645e37c5849000f