From 7abd7c5c2e086c4469d07566a70ffc2f84f2779d Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 2 Feb 2021 08:04:54 -0500 Subject: [PATCH] merge lol!! --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 41927c759..8b70997e2 100644 --- a/README.md +++ b/README.md @@ -29,11 +29,6 @@ IF YOU WANT TO COMPILE THE GAME YOURSELF, CONTINUE READING!!! First you need to install Haxe and HaxeFlixel. I'm too lazy to write and keep updated with that setup (which is pretty simple). The link to that is on the [HaxeFlixel website](https://haxeflixel.com/documentation/getting-started/) -<<<<<<< HEAD -That should give you HaxeFlixel and all of it's setup and shit. If you run into issues INSTALLING FLIXEL, ask them in the #flixel channel in the Haxe Discord server: https://discord.gg/5ybrNNWx9S - -======= ->>>>>>> b64a14af64424954a704712c977754049eb544cc Other installations you'd need is the additional libraries, a fully updated list will be in `Project.xml` in the project root, but here are the one's I'm using as of writing. ```