diff options
Diffstat (limited to '')
| -rw-r--r-- | NewerProject.yaml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/NewerProject.yaml b/NewerProject.yaml index acfa899..a8a62e3 100644 --- a/NewerProject.yaml +++ b/NewerProject.yaml @@ -18,9 +18,6 @@ modules: # - processed/replay.yaml
- processed/growup.yaml
- processed/levelspecial.yaml
-<<<<<<< HEAD - processed/eventlooper.yaml
- processed/spritespawner.yaml
-======= - processed/compression.yaml
->>>>>>> 673484e580337cd1ab14bfd43c770f004494b9a4 |