NativeCFFI: Fix git leftovers

Author: ACrazyTown

src/lime/_internal/backend/native/NativeCFFI.hx

@@ -1672,11 +1672,10 @@ class NativeCFFI
 
 	@:cffi private static function lime_alc_suspend_context(context:CFFIPointer):Void;
 
-<<<<<<< HEAD
 	@:cffi private static function lime_alc_event_control_soft(count:Int, events:Array<Int>, enable:Bool):Void;
 
 	@:cffi private static function lime_alc_event_callback_soft(device:CFFIPointer, callback:Dynamic):Void;
-=======
+
 	@:cffi private static function lime_alc_capture_open_device(devicename:String, frequency:Int, format:Int, buffersize:Int):CFFIPointer;
 
 	@:cffi private static function lime_alc_capture_close_device(device:CFFIPointer):Bool;
@@ -1686,7 +1685,6 @@ class NativeCFFI
 	@:cffi private static function lime_alc_capture_stop(device:CFFIPointer):Void;
 
 	@:cffi private static function lime_alc_capture_samples(device:CFFIPointer, buffer:Dynamic, samples:Int):Void;
->>>>>>> feat/openal-capture
 
 	@:cffi private static function lime_al_gen_filter():CFFIPointer;