From: Rachael <srbennett@gmail.com>
Date: Sun, 16 Oct 2016 16:37:31 +0000 (-0700)
Subject: resolving merge conflicts. I didn't intentionally change anything in the README file...
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=d9ee154c098eecbf6c9bc87f63434ed6e83feed0;p=acmetensortoys-esp-lua_lamp

resolving merge conflicts. I didn't intentionally change anything in the README file...
---

d9ee154c098eecbf6c9bc87f63434ed6e83feed0
diff --cc lamp-touch.lua
index 58e6058,d56a9cd..db8ece3
--- a/lamp-touch.lua
+++ b/lamp-touch.lua
@@@ -134,11 -131,8 +132,9 @@@ local function ontouch(
    -- if bit.isset(down,4) then end
  
    -- draw if we've claimed it!
 +  print("ahhhh", ledfb, touchfb)
    if ledfb == touchfb then
      touchtmr:unregister()
-     print("XXXXX looking for XXXXX")
-     print(touchfnix)
      loaddrawfn(touchfns[touchfnix])(touchtmr,touchfb,touchcolorvec(touchcolor)); dodraw()
      touchtmr:start()
    end