Fixed|libcommon: Removed leftover merge artefacts in p_switch.c

skyjake · Sep 28, 2012 · 9eb6d61 · 9eb6d61
1 parent 8541764
commit 9eb6d61
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/doomsday/plugins/common/src/p_switch.c b/doomsday/plugins/common/src/p_switch.c
@@ -261,13 +261,8 @@ void P_InitSwitchList(void)
     Str_Free(&path);
     Uri_Delete(uri);
 
-<<<<<<< HEAD
-    if(lumpNum > 0)
-        W_CacheChangeTag(lumpNum, PU_CACHE);
-=======
     if(lumpNum >= 0)
-        W_UnlockLump(lumpNum);
->>>>>>> dde7d0f... Fixed|libcommon: Failed read SWITCHES lumps at directory index #0
+        W_CacheChangeTag(lumpNum, PU_CACHE);
 
     numswitches = index / 2;
     switchlist[index] = 0;