Fixed merge error

alliedmodders · Feb 16, 2018 · 64cb38e · 64cb38e
1 parent 2e694c9
commit 64cb38e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/amxmodx/msvc12/amxmodx_mm.vcxproj.filters b/amxmodx/msvc12/amxmodx_mm.vcxproj.filters
@@ -584,11 +584,10 @@
     <ClInclude Include="..\..\public\resdk\mod_rehlds_api.h">
       <Filter>ReSDK</Filter>
     </ClInclude>
-<<<<<<< HEAD
     <ClInclude Include="..\CFrameAction.h">
-=======
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\logger.h">
->>>>>>> a4f3d94... Implemented support for a customizable logger
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>