diff options
| author | Colin Noga <Tempus@Spectrum-Song.local> | 2011-06-26 11:51:22 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@Spectrum-Song.local> | 2011-06-26 11:51:22 -0500 |
| commit | 1de95fd66079da80e61180a99882c25ab91f31c1 (patch) | |
| tree | 9f251ba504e57340bf9a81a1900d4d91b9856b50 /NewerProject.yaml | |
| parent | aaec1327c178ae951a0b19a8150a69fc00eb3011 (diff) | |
| download | kamek-1de95fd66079da80e61180a99882c25ab91f31c1.tar.gz kamek-1de95fd66079da80e61180a99882c25ab91f31c1.zip | |
Clean up the mess I made with merge.
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 |