3 files changed, 1 insertions, 17 deletions
diff --git a/lang/lua/astal/gtk3/app.lua b/lang/lua/astal/gtk3/app.lua
index 13347c3..7895f69 100644
--- a/lang/lua/astal/gtk3/app.lua
+++ b/lang/lua/astal/gtk3/app.lua
@@ -5,15 +5,6 @@ local AstalIO = lgi.require("AstalIO", "0.1")
 local AstalLua = Astal.Application:derive("AstalLua")
 local request_handler
 
-local function unpack(t, i)
-    i = i or 1
-    if t[i] == nil then
-        return nil
-	else
-        return t[i], unpack(t, i + 1)
-    end
-end
-
 function AstalLua:do_request(msg, conn)
     if type(request_handler) == "function" then
         request_handler(msg, function(response)
@@ -85,7 +76,7 @@ function Astal.Application:start(config)
 
     app.on_activate = function()
         if type(config.main) == "function" then
-            config.main(unpack(arg))
+            config.main(table.unpack(arg))
         end
         if config.hold then
             self:hold()
@@ -95,13 +86,8 @@ function Astal.Application:start(config)
     local _, err = app:acquire_socket()
     if err ~= nil then
         return config.client(function(msg)
-<<<<<<< HEAD:lang/lua/astal/gtk3/app.lua
             return AstalIO.send_message(self.instance_name, msg)
         end, table.unpack(arg))
-=======
-            return Astal.Application.send_message(self.instance_name, msg)
-        end, unpack(arg))
->>>>>>> 18df91b (core: lua compat 5.1/5.4/luajit):core/lua/astal/application.lua
     end
 
     self:run(nil)
diff --git a/lang/lua/astal/init.lua b/lang/lua/astal/init.lua
index 783c78a..5630ba4 100644
--- a/lang/lua/astal/init.lua
+++ b/lang/lua/astal/init.lua
@@ -2,7 +2,6 @@ if not table.unpack then
     table.unpack = unpack
 end
 
-
 local lgi = require("lgi")
 local Binding = require("astal.binding")
 local File = require("astal.file")
diff --git a/lang/lua/astal/variable.lua b/lang/lua/astal/variable.lua
index c2ed337..f9be161 100644
--- a/lang/lua/astal/variable.lua
+++ b/lang/lua/astal/variable.lua
@@ -5,7 +5,6 @@ local Binding = require("astal.binding")
 local Time = require("astal.time")
 local Process = require("astal.process")
 
-
 ---@class Variable
 ---@field private variable table
 ---@field private err_handler? function