diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-03-21 22:59:52 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-03-21 22:59:52 -0700 |
| commit | f56a1cade6911129ea32d48727a70ce8f9bc783f (patch) | |
| tree | a3bb7d9a96555fd227aae887921af20c228e9e71 /src/createObject.c | |
| parent | 8734f766b467b5f469afd6b24b5cf07be7e53ad0 (diff) | |
| parent | 41684172807db9cb74cfe2879e527eb2fcb6b230 (diff) | |
fix merge conflict
Diffstat (limited to 'src/createObject.c')
| -rw-r--r-- | src/createObject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/createObject.c b/src/createObject.c index dc8de778..16f5df16 100644 --- a/src/createObject.c +++ b/src/createObject.c @@ -1,6 +1,6 @@ #include "global.h" #include "entity.h" -#include "position.h" +#include "coord.h" #include "room.h" #include "createObject.h" |