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