From 3814302392469b5e80b51df9a917fc785b174e37 Mon Sep 17 00:00:00 2001 From: Norgus Date: Tue, 8 May 2018 21:56:25 +0100 Subject: [PATCH] Not even sure why git put these lines in. --- Update/zonik_005_vm00_n01.txt | 3 --- Update/zonik_005_vm0x_n01.txt | 3 --- 2 files changed, 6 deletions(-) diff --git a/Update/zonik_005_vm00_n01.txt b/Update/zonik_005_vm00_n01.txt index 5927aad..35f4b58 100644 --- a/Update/zonik_005_vm00_n01.txt +++ b/Update/zonik_005_vm00_n01.txt @@ -51,7 +51,6 @@ void dialog003() NULL, "\"Ahahaha~ Keiichi-kun is bending forward... kyute kyute!!\"", GetGlobalFlag(GLinemodeSp)); if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } } -<<<<<<< HEAD void dialog004() { @@ -125,5 +124,3 @@ void dialog006() NULL, "I heard what sounded like a \"zhazhing\" three times. His 3-gauge super!?", Line_Normal); ClearMessage(); } -======= ->>>>>>> 3895b805810bfc1a554b8e247727a020a188e2f5 diff --git a/Update/zonik_005_vm0x_n01.txt b/Update/zonik_005_vm0x_n01.txt index 334b3dd..fccf91e 100644 --- a/Update/zonik_005_vm0x_n01.txt +++ b/Update/zonik_005_vm0x_n01.txt @@ -51,7 +51,6 @@ void dialog003() NULL, "\"Ahahaha~ Keiichi-kun is so... kyute kyute!!\"", GetGlobalFlag(GLinemodeSp)); if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } } -<<<<<<< HEAD void dialog004() { @@ -125,5 +124,3 @@ void dialog006() NULL, "A \"zhazhing\" sound echoed loudly. He went straight for the special move!?", Line_Normal); ClearMessage(); } -======= ->>>>>>> 3895b805810bfc1a554b8e247727a020a188e2f5