projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity

Merge conflict resolve

Browse Source
This commit is contained in:
CharonInferar
2014-08-09 18:17:01 +02:00
parent 79d56ca4ef a8a824b8a7
commit 0f8466bf44
1452 changed files with 14987 additions and 14349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/tangible/TangibleObject.java
+3
View File
@@ -49,8 +49,11 @@ import resources.objects.ObjectMessageBuilder;
import resources.objects.SWGList;
import resources.objects.SWGSet;
import resources.objects.creature.CreatureObject;
<<<<<<< HEAD
import resources.objects.installation.InstallationObject;
import tools.DevLog;
=======
>>>>>>> origin/master
import engine.clientdata.ClientFileManager;
import engine.clientdata.visitors.IDManagerVisitor;
import engine.clients.Client;