From dca6ead6745bfd381fddedb719f4bd4595d57867 Mon Sep 17 00:00:00 2001
From: Nennneko5787 <nennneko@tensi.org>
Date: Sat, 18 Feb 2023 16:45:16 +0900
Subject: [PATCH] Bug Fix

---
 .github/workflows/main.yml |  3 +++
 README.md                  |  1 +
 hxformat.json              | 18 ------------------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9fd813090..a1067d03d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,6 +47,7 @@ jobs:
           haxelib install hscript
           haxelib install newgrounds 1.1.5
           haxelib install hxCodec
+          haxelib install hxcpp-debug-server
           haxelib git polymod https://github.com/larsiusprime/polymod.git
           haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
           haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
@@ -86,6 +87,7 @@ jobs:
           haxelib install hscript
           haxelib install newgrounds 1.1.5
           haxelib install hxCodec
+          haxelib install hxcpp-debug-server
           haxelib git polymod https://github.com/larsiusprime/polymod.git
           haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
           haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
@@ -126,6 +128,7 @@ jobs:
           haxelib install hscript
           haxelib install newgrounds 1.1.5
           haxelib install hxCodec
+          haxelib install hxcpp-debug-server
           haxelib git polymod https://github.com/larsiusprime/polymod.git
           haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
           haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
diff --git a/README.md b/README.md
index 2d0dc99f7..4508d71e3 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ haxelib install flixel-ui
 haxelib install hscript
 haxelib install newgrounds 1.1.5
 haxelib install hxCodec
+haxelib install hxcpp-debug-server
 ```
 Next, [install Git.](https://git-scm.com/downloads)  
 Then, execute this command.
diff --git a/hxformat.json b/hxformat.json
index 184faee0d..66cb3869e 100644
--- a/hxformat.json
+++ b/hxformat.json
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 {
 	"lineEnds": {
 		"leftCurly": "both",
@@ -14,20 +13,3 @@
 		"tryCatch": "next"
 	}
 }
-=======
-{
-	"lineEnds": {
-		"leftCurly": "both",
-		"rightCurly": "both",
-		"objectLiteralCurly": {
-			"leftCurly": "after"
-		}
-	},
-	"sameLine": {
-		"ifElse": "next",
-		"doWhile": "next",
-		"tryBody": "next",
-		"tryCatch": "next"
-	}
-}
->>>>>>> 65310c965b34ee16588e03d012c3d5be4c6a1679