projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-30 15:13:10 -04:00
Code Issues Projects Releases Wiki Activity

fix merge errors (i hope)

Browse Source
This commit is contained in:
darkk1138
2013-11-24 11:24:12 +01:00
parent d3ff1188d8
commit b178a96dfc
2 changed files with 4 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/NGECore.java
+1 -2
View File
@@ -59,8 +59,7 @@ import services.command.CombatCommand;
import services.command.CommandService;
import services.gcw.GCWService;
import services.guild.GuildService;
import services.login.LoginService;
import services.login.LoginService;
import services.LoginService;
import services.map.MapService;
import services.object.ObjectService;
import services.object.UpdateService;