project: Fix merge

2022-04-29 08:28:20 +02:00
parent 53a4025245
commit 936f83793d
2 changed files with 2 additions and 7 deletions
--- a/cache/src/main/java/net/runelite/cache/item/ItemSpriteFactory.java
+++ b/cache/src/main/java/net/runelite/cache/item/ItemSpriteFactory.java
@@ -91,11 +91,7 @@ public class ItemSpriteFactory
 		else if (item.boughtTemplateId != -1)
 		{
 			auxSpritePixels = createSpritePixels(itemProvider, modelProvider, spriteProvider, textureProvider,
-<<<<<<< HEAD
-					item.boughtId, quantity, border, shadowColor, false);
-=======
 				item.boughtId, quantity, border, 0, false);
->>>>>>> runelite/master
 			if (auxSpritePixels == null)
 			{
 				return null;