Multiple settings changed to make the system more stable, less spontanious crashes, reduced stack usage, changed the keyboard in asynchronious, added a read function in storage

Author: paxo-rch

storage/apps/alarme/alarms.tab

@@ -1,5 +1,9 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 {[1]={["time"]="15:36", ["enabled"]=0, }, [2]={["time"]="19:05", ["enabled"]=0, }, }
 =======
 {[1]={["time"]="19:50", ["enabled"]=0, }, [2]={["enabled"]=1, ["time"]="00:10", }, }
 >>>>>>> d9f4ab7 (Multiple settings changed to make the system more stable, less spontanious crashes, reduced stack usage, changed the keyboard in asynchronious, added a read function in storage)
+=======
+{[1]={["time"]="19:50", ["enabled"]=0, }, [2]={["enabled"]=1, ["time"]="00:10", }, }
+>>>>>>> d9f4ab7 (Multiple settings changed to make the system more stable, less spontanious crashes, reduced stack usage, changed the keyboard in asynchronious, added a read function in storage)

storage/apps/messages/app.lua

@@ -136,6 +136,7 @@ function converation(number)
 
     add:onClick(function ()
         -- print("add button clicked")
+<<<<<<< HEAD
 <<<<<<< HEAD
         local msg = newMessage(number)
 
@@ -144,13 +145,18 @@ function converation(number)
             appendMessage(msg, list)
         end
 =======
+=======
+>>>>>>> d9f4ab7 (Multiple settings changed to make the system more stable, less spontanious crashes, reduced stack usage, changed the keyboard in asynchronious, added a read function in storage)
         local msg = newMessage(number,
             function ()
                 if(msg ~= "") then
                     -- print("new message received: " .. msg)
                     appendMessage(msg, list)
                 end
             end)
+<<<<<<< HEAD
+>>>>>>> d9f4ab7 (Multiple settings changed to make the system more stable, less spontanious crashes, reduced stack usage, changed the keyboard in asynchronious, added a read function in storage)
+=======
 >>>>>>> d9f4ab7 (Multiple settings changed to make the system more stable, less spontanious crashes, reduced stack usage, changed the keyboard in asynchronious, added a read function in storage)
     end)