mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-11 12:41:30 +00:00
hotfix: merge fix
This commit is contained in:
parent
e71ce001ff
commit
0447618f7e
@ -56,19 +56,6 @@
|
||||
#include "repositories/damageshieldtypes_repository.h"
|
||||
#include "repositories/items_repository.h"
|
||||
|
||||
namespace ItemField
|
||||
{
|
||||
enum {
|
||||
source = 0,
|
||||
#define F(x) x,
|
||||
#include "item_fieldlist.h"
|
||||
#undef F
|
||||
updated,
|
||||
minstatus,
|
||||
comment,
|
||||
};
|
||||
}
|
||||
|
||||
SharedDatabase::SharedDatabase()
|
||||
: Database()
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user