Merge pull request A3Wasteland#43 from A3Wasteland/AgentRev_TPG_merges

Forgot to remove conflict leftovers
micovery · Sep 11, 2013 · 0230713 · 0230713
2 parents 0ac40ed + 6d96263
commit 0230713
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/persistence/players/c_playerDBSetup.sqf b/persistence/players/c_playerDBSetup.sqf
@@ -57,14 +57,6 @@ applyPlayerDBValues =
 			{
 				player addMagazine [_className, _ammoCount];
 			};
-<<<<<<< Updated upstream
-			if(_fits == 3) then
-			{
-				_backpack = unitBackpack player;
-				_backpack addMagazineCargo [_className,1];
-			};
-=======
->>>>>>> Stashed changes
 		} forEach _varValue;
 	};