Fix repository

catsmackaroo · Mar 10, 2024 · f4219a8 · f4219a8
1 parent d8be14f
commit f4219a8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/LibertyTweaks/LibertyTweaks.csproj b/LibertyTweaks/LibertyTweaks.csproj
@@ -68,7 +68,6 @@
     <Compile Include="Enhancements\Combat\RemoveWeapons.cs" />
     <Compile Include="Enhancements\Combat\UnseenSlipAway.cs" />
     <Compile Include="Enhancements\Combat\WeaponMagazines.cs" />
-    <Compile Include="Enhancements\Dialogue\StunPunch.cs" />
     <Compile Include="Enhancements\Dialogue\MoreCombatLines.cs" />
     <Compile Include="Enhancements\Dialogue\SearchBody.cs" />
     <Compile Include="Enhancements\Dialogue\VLikeScreaming.cs" />

diff --git a/LibertyTweaks/Main.cs b/LibertyTweaks/Main.cs
@@ -79,11 +79,7 @@ public Main()
 
             Initialized += Main_Initialized;
             Tick += Main_Tick;
-<<<<<<< HEAD
-            Drawing +=Main_Drawing;
-=======
             Drawing += Main_Drawing;
->>>>>>> f8e8a85da25b5ab51bfe0634cb47e6cb28c4712a
             KeyDown += Main_KeyDown;
             ProcessAutomobile += Main_ProcessAutomobile;
             ProcessCamera += Main_ProcessCamera;
@@ -254,11 +250,6 @@ private void Main_Tick(object sender, EventArgs e)
             WheelFix.PreChecks();
         }
 
-        private void Main_Drawing(object sender, EventArgs e)
-        {
-            NoCursorEscape.Process();
-        }
-
         private void Main_KeyDown(object sender, KeyEventArgs e)
         {