From 2ef2a61dfac27d94a1d65a65d02eb3ef274c3aa1 Mon Sep 17 00:00:00 2001
From: Insality <insality@gmail.com>
Date: Tue, 3 Nov 2020 23:25:59 +0300
Subject: [PATCH] Merge fixes

---
 druid/system/druid_instance.lua | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/druid/system/druid_instance.lua b/druid/system/druid_instance.lua
index 2e8b907..d66f543 100644
--- a/druid/system/druid_instance.lua
+++ b/druid/system/druid_instance.lua
@@ -524,27 +524,15 @@ function DruidInstance.new_checkbox_group(self, nodes, callback, click_nodes)
 end
 
 
-<<<<<<< HEAD
---- Create drag basic component
--- @function druid:new_drag
--- @tparam args ... drag init args
--- @treturn Component drag component
-function Druid.new_drag(self, ...)
-	return Druid.create(self, drag, ...)
-end
-
-
 --- Create infinity list basic component
 -- @function druid:new_infinity_list
 -- @tparam args ... drag init args
--- @treturn Component drag component
-function Druid.new_infinity_list(self, ...)
-	return Druid.create(self, infinity_list, ...)
+-- @treturn Component infinity list component
+function DruidInstance.new_infinity_list(self, ...)
+	return DruidInstance.create(self, infinity_list, ...)
 end
 
 
-return Druid
-=======
 --- Create radio_group component
 -- @tparam DruidInstance self
 -- @tparam node[] nodes Array of gui node
@@ -583,4 +571,3 @@ end
 
 
 return DruidInstance
->>>>>>> develop