From f9d64d492234f2368956de30ab2207796d3caa20 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Sun, 12 May 2019 00:03:43 -0500
Subject: [PATCH] Fix merge

---
 .../ACE_Medical_Treatment_Actions.hpp               | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
index 1f9c08d8ea..de89e14aa9 100644
--- a/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
+++ b/addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
@@ -104,19 +104,6 @@ class GVAR(actions) {
         condition = QFUNC(splintCondition);
         litter[] = {};
     };
-    // --- splint
-    class Splint: BasicBandage {
-        displayName = CSTRING(Apply_Splint);
-        displayNameProgress = CSTRING(Applying_Splint);
-        category = "bandage";
-        icon = QPATHTOEF(medical_gui,ui\splint.paa);
-        allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"};
-        items[] = {"ACE_splint"};
-        treatmentTime = 7;
-        callbackSuccess = QFUNC(splint);
-        condition = QFUNC(splintCondition);
-        litter[] = {};
-    };
 
     // - Syringes -------------------------------------------------------------
     class Morphine: FieldDressing {