From ba4ecd16d2527debb31b94298d31e63a1dba41b0 Mon Sep 17 00:00:00 2001
From: Zweihorn <none@nowhere>
Date: Sun, 19 May 2019 15:00:19 +0200
Subject: [PATCH] wool to make use of global dye.dyes

---
 mods/dye/init.lua  | 4 ++--
 mods/wool/init.lua | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mods/dye/init.lua b/mods/dye/init.lua
index 7db8c0e..381eb75 100644
--- a/mods/dye/init.lua
+++ b/mods/dye/init.lua
@@ -10,12 +10,12 @@ local S = minetest.get_translator()
 dye.dyes = {
 	{"white",      S("White")},
 	{"grey",       S("Grey")},
-	{"dark_grey",  S("Dark grey")},
+	{"dark_grey",  S("Dark Grey")},
 	{"black",      S("Black")},
 	{"violet",     S("Violet")},
 	{"blue",       S("Blue")},
 	{"cyan",       S("Cyan")},
-	{"dark_green", S("Dark green")},
+	{"dark_green", S("Dark Green")},
 	{"green",      S("Green")},
 	{"yellow",     S("Yellow")},
 	{"brown",      S("Brown")},
diff --git a/mods/wool/init.lua b/mods/wool/init.lua
index 3c3c371..fbdd87e 100644
--- a/mods/wool/init.lua
+++ b/mods/wool/init.lua
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 local dyes = dye.dyes
-=======
->>>>>>> ref luacheck whitespace warnings
 
 for i = 1, #dyes do
 	local name, desc = unpack(dyes[i])