Fix merge a little more

2025-05-25 19:17:45 +00:00 · 2018-01-24 12:23:58 -02:00 · 2018-01-24 12:23:58 -02:00 · e24791b59f
commit e24791b59f
parent 548ed86fbe
22 changed files with 0 additions and 0 deletions
--- a/src/servers/sapphire_zone/Social/ContentGroup.cpp
+++ b/src/servers/sapphire_zone/Social/ContentGroup.cpp
--- a/src/servers/sapphire_zone/Social/ContentGroup.h
+++ b/src/servers/sapphire_zone/Social/ContentGroup.h
--- a/src/servers/sapphire_zone/Social/FreeCompany.cpp
+++ b/src/servers/sapphire_zone/Social/FreeCompany.cpp
--- a/src/servers/sapphire_zone/Social/FreeCompany.h
+++ b/src/servers/sapphire_zone/Social/FreeCompany.h
--- a/src/servers/sapphire_zone/Social/FriendList.cpp
+++ b/src/servers/sapphire_zone/Social/FriendList.cpp
--- a/src/servers/sapphire_zone/Social/FriendList.h
+++ b/src/servers/sapphire_zone/Social/FriendList.h
--- a/src/servers/sapphire_zone/Social/Group.cpp
+++ b/src/servers/sapphire_zone/Social/Group.cpp
--- a/src/servers/sapphire_zone/Social/Group.h
+++ b/src/servers/sapphire_zone/Social/Group.h
--- a/src/servers/sapphire_zone/Social/Linkshell.cpp
+++ b/src/servers/sapphire_zone/Social/Linkshell.cpp
--- a/src/servers/sapphire_zone/Social/Linkshell.h
+++ b/src/servers/sapphire_zone/Social/Linkshell.h
--- a/src/servers/sapphire_zone/Social/Manager/ContentGroupMgr.cpp
+++ b/src/servers/sapphire_zone/Social/Manager/ContentGroupMgr.cpp
--- a/src/servers/sapphire_zone/Social/Manager/ContentGroupMgr.h
+++ b/src/servers/sapphire_zone/Social/Manager/ContentGroupMgr.h
--- a/src/servers/sapphire_zone/Social/Manager/FreeCompanyMgr.cpp
+++ b/src/servers/sapphire_zone/Social/Manager/FreeCompanyMgr.cpp
--- a/src/servers/sapphire_zone/Social/Manager/FreeCompanyMgr.h
+++ b/src/servers/sapphire_zone/Social/Manager/FreeCompanyMgr.h
--- a/src/servers/sapphire_zone/Social/Manager/LinkshellMgr.cpp
+++ b/src/servers/sapphire_zone/Social/Manager/LinkshellMgr.cpp
--- a/src/servers/sapphire_zone/Social/Manager/LinkshellMgr.h
+++ b/src/servers/sapphire_zone/Social/Manager/LinkshellMgr.h
--- a/src/servers/sapphire_zone/Social/Manager/PartyMgr.cpp
+++ b/src/servers/sapphire_zone/Social/Manager/PartyMgr.cpp
--- a/src/servers/sapphire_zone/Social/Manager/PartyMgr.h
+++ b/src/servers/sapphire_zone/Social/Manager/PartyMgr.h
--- a/src/servers/sapphire_zone/Social/Manager/SocialMgr.cpp
+++ b/src/servers/sapphire_zone/Social/Manager/SocialMgr.cpp
--- a/src/servers/sapphire_zone/Social/Manager/SocialMgr.h
+++ b/src/servers/sapphire_zone/Social/Manager/SocialMgr.h
--- a/src/servers/sapphire_zone/Social/Party.cpp
+++ b/src/servers/sapphire_zone/Social/Party.cpp
--- a/src/servers/sapphire_zone/Social/Party.h
+++ b/src/servers/sapphire_zone/Social/Party.h