From 00a7feff25afbe12b7fd271af1d2aadd52f6dbf7 Mon Sep 17 00:00:00 2001 From: Christian Daniel Jensen Date: Tue, 3 Nov 2026 15:59:50 -0700 Subject: [PATCH] Jasper --- cockatrice/resources/icons/essence/J.svg | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/cockatrice/resources/icons/essence/J.svg b/cockatrice/resources/icons/essence/J.svg index cb7b06c8d..a6027d25c 100644 --- a/cockatrice/resources/icons/essence/J.svg +++ b/cockatrice/resources/icons/essence/J.svg @@ -1,15 +1 @@ -<<<<<<< HEAD - - - J Essence (Jasper) - - - - - - J - -======= - ->>>>>>> 1fb06a985 (piles) + \ No newline at end of file