Merge remote-tracking branch 'origin/Monster-Update-6' into nio_mustard

2021-08-08 07:44:33 +10:00
parent ad87c2730a 2e03d41097
commit 3b401ccf1c
59 changed files with 95 additions and 111 deletions
--- a/game/mods_example/template/chapter2_redo.rpy
+++ b/game/mods_example/template/chapter2_redo.rpy
@ -8,4 +8,32 @@ 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"
+    St "Sample Text"
+    N "Sample Text"
+    Nas "Sample Text"
+    T "Sample Text"
+    Attendant "Sample Text"
+    Sp "Sample Text"
+    Re "Sample Text"
+    D "Sample Text"
+    FM "Sample Text"
+    FD "Sample Text"
+    Tsuki "Sample Text"
+    unknown "Sample Text"
+    jingo "Sample Text"
+    MaitD "Sample Text"
+    Moe "Sample Text"
+    Vince "Sample Text"
+    Waitress "Sample Text"
+    AnonAndFang "Sample Text"
+    SV "Sample Text"
+    carl "Sample Text"
+    Drf "Sample Text"
+    FRT "Sample Text"
+>>>>>>> origin/Monster-Update-6
    return