Bug Fix
This commit is contained in:
parent
0313bef5cd
commit
dca6ead674
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue