version bump and merge fix

Crowdedlight · Oct 22, 2024 · 6a15410 · 6a15410
1 parent 6602f84
commit 6a15410
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/addons/emp/functions/fnc_playerEffect.sqf b/addons/emp/functions/fnc_playerEffect.sqf
@@ -17,11 +17,7 @@ if (!hasInterface) exitWith {};
 
 // emp sound and shake, but only if close enough
 if ((player distance _pos) < (_range*2)) then {
-<<<<<<< HEAD
 	playSound "crowsew_emp_blast";
-=======
-	playSound "emp_blast";
->>>>>>> d0923b2 (linting fixes from hemtt)
 
 	// cam shake
 	enableCamShake true;

diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
@@ -1,3 +1,3 @@
 #define MAJOR 2
-#define MINOR 2
-#define PATCH 1
+#define MINOR 3
+#define PATCH 0