From 4293c488364171b4abf5d1dccac1a1fb55a42a31 Mon Sep 17 00:00:00 2001
From: ailurux <ailuruxx@gmail.com>
Date: Wed, 20 Mar 2024 14:08:11 +1100
Subject: [PATCH] Fix bad merge

---
 lua/main.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lua/main.lua b/lua/main.lua
index d84e2417..1a605dab 100644
--- a/lua/main.lua
+++ b/lua/main.lua
@@ -1,9 +1,14 @@
 local font = require("font")
 local vol = require("volume")
 local theme = require("theme")
+local controls = require("controls")
+local time = require("time")
+
+local lock_time = time.ticks()
 
 -- Set up property bindings that are used across every screen.
 GLOBAL_BINDINGS = {
+  -- Show an alert with the current volume whenever the volume changes
   vol.current_pct:bind(function(pct)
     require("alerts").show(function()
       local container = lvgl.Object(nil, {