merge

README.md

@@ -74,13 +74,10 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
 - Newer compression options are supported.
 - UNFLoader (flashcart USB library) is supported, allowing for debugging on EverDrive/64Drive.
 - It has been patched with someone2639's shiftable segments patch
-<<<<<<< HEAD
-=======
 - Wiseguy's instant input patch has been added to allow for less input lag on emulation (Does not affect console)
   This does mean that any framebuffer effects will have to be done on buffer 0 if targeting emulators
 - Automatic console and emulator detection: Use the `gIsConsole` variable to wrap your code in an emulator check.
 - Separate defines for emulator and console black border height.
->>>>>>> 225c1eef55c40d77f3ec9991248fefd390c788d8
 - Getting HVQM FMV support to work with the game is WIP.
 
 Requirements are the same as regular SM64, however a GCC MIPS cross compiler is also required. If you're on Debian-like Linux, you can use the ``gcc-mips-linux-gnu`` package. The toolchain that comes with my SDK is also supported.

include/config.h

@@ -35,24 +35,11 @@
 
 // Border Height Define for NTSC Versions
 #ifdef TARGET_N64
-<<<<<<< HEAD
 // Size of the black border at the top and bottom of the screen. You can set it to different values for console and emulator.
 // There is generally no reason to have a value other than 0 for emulator. As for console, it provides a (small) performance boost.
 #define BORDER_HEIGHT_CONSOLE 0
 #define BORDER_HEIGHT_EMULATOR 0
 
-=======
-#ifndef VERSION_EU
-#define BORDER_HEIGHT_CONSOLE 8
-#define BORDER_HEIGHT_EMULATOR 0
-#else
-#define BORDER_HEIGHT_CONSOLE 1
-#define BORDER_HEIGHT_EMULATOR 0
-#endif
-#else
-#define BORDER_HEIGHT_CONSOLE 0
-#define BORDER_HEIGHT_EMULATOR 0
->>>>>>> 225c1eef55c40d77f3ec9991248fefd390c788d8
 #endif
 
 // -- ultrasm64-extbounds specific settings --