Merge fix

2021-08-08 07:49:35 +10:00
parent 3b401ccf1c
commit 798ff85ff6
3 changed files with 0 additions and 27 deletions
--- a/game/mods_example/template/chapter2_redo.rpy
+++ b/game/mods_example/template/chapter2_redo.rpy
@ -8,8 +8,6 @@ label chapter_2_new:
    play music 'audio/OST/Those Other Two Weirdos.ogg'
    show anon neutral flip at aright with dissolve
    A "Sample Text"
-<<<<<<< HEAD
-=======
    F "Sample Text"
    Lucy "Sample Text"
    Ro "Sample Text"
@ -35,5 +33,4 @@ label chapter_2_new:
    carl "Sample Text"
    Drf "Sample Text"
    FRT "Sample Text"
->>>>>>> origin/Monster-Update-6
    return