From 77f4b5ceadf778d81af844494e599782fe5932bd Mon Sep 17 00:00:00 2001
From: deepmurk <axiao@protonmail.com>
Date: Sun, 15 Apr 2018 19:13:51 -0400
Subject: [PATCH] Revert Fix
Fix
---
src/js/vectorRevampedArtControlJS.tw | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/js/vectorRevampedArtControlJS.tw b/src/js/vectorRevampedArtControlJS.tw
index 616afc0d99a..2017d7345d2 100644
--- a/src/js/vectorRevampedArtControlJS.tw
+++ b/src/js/vectorRevampedArtControlJS.tw
@@ -246,12 +246,7 @@ class ArtStyleControl {
["dyed green", "#A6C373"],
["blue dyed", "#5b8eb7"],
["dyed blue", "#5b8eb7"],
-<<<<<<< HEAD
["tiger striped", "#e2d75d"]
-=======
- ["tiger striped", "#e2d75d"],
- ["olive", "#a46237"]
->>>>>>> pregmod-master
];
var skinPaletteMap = new Map(skinPalette);
--
GitLab