summaryrefslogtreecommitdiff
path: root/include/global.fieldmap.h
diff options
context:
space:
mode:
authorPaul Sander <nintendo6496@googlemail.com>2018-11-30 22:16:04 +0100
committerPaul Sander <nintendo6496@googlemail.com>2018-11-30 22:16:04 +0100
commitfc1fd9c983b0ea35414f699ab6c4b4fdd617e8d0 (patch)
treed1972ab6d6b1ad9ab93bf5bde673a722a3a9f2c7 /include/global.fieldmap.h
parent308e60da31388973ac8885127b12db300e21100a (diff)
parent63c205e7d0094756ea851e0aed0852671329905c (diff)
merge upstream
Diffstat (limited to 'include/global.fieldmap.h')
-rw-r--r--include/global.fieldmap.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 98077d8d4..ed5054b7d 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -1,8 +1,6 @@
#ifndef GUARD_GLOBAL_FIELDMAP_H
#define GUARD_GLOBAL_FIELDMAP_H
-#include "global.h"
-
#define NUM_FIELD_OBJECTS 16
enum