diff options
Diffstat (limited to 'include/entities.h')
| -rw-r--r-- | include/entities.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/entities.h b/include/entities.h index fc2f35c..5b6bcf1 100644 --- a/include/entities.h +++ b/include/entities.h @@ -100,7 +100,3 @@ ENTITY TYPES <<<<<<< HEAD |->1 Rabbit **/ -======= -|->1 Skirl -**/ ->>>>>>> 58716d5e4f20eb5a30025c88fe5119a0e40c4187 |