diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-11 14:59:41 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-11 14:59:41 -0500 |
| commit | f658a355e5434a647153d76087b50eec0d5041b1 (patch) | |
| tree | 3d6a4208a965d358154edc4b7f52a64eb18b027f /Makefile | |
| parent | ec84c9227bf70ff9e668a6dc7d1f712ca5911b57 (diff) | |
idiot, remove conflicts please
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -160,12 +160,8 @@ include override.mk %.lz: % ; $(GBAGFX) $< $@ $(GFX_OPTS) %.rl: % ; $(GBAGFX) $< $@ $(GFX_OPTS) -<<<<<<< HEAD -======= - #### Sound Rules #### ->>>>>>> 62042c1cbf95b3f26fba3baa4f0a339f0b663462 sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif $(AIF2PCM) $< $@ --compress |