Fix bad merge

1 files changed, 5 insertions, 0 deletions

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, {