Resolve merge conflict

Author: rtoal

lolcode/clockhands.lol

@@ -7,15 +7,9 @@ HAI 1.3
   IF U SAY SO
 
   IM IN YR CLOCK UPPIN YR I TIL BOTH SAEM I AN 11
-<<<<<<< HEAD
-    I HAS A T ITZ MAEK QUOSHUNT OF SUM OF PRODUKT OF 43200 AN I AN 21600 AN 11 NUMBR
-    I HAS A H ITZ MAEK QUOSHUNT OF T AN 3600 NUMBR
-    I HAS A M ITZ MOD OF MAEK QUOSHUNT OF T AN 60 NUMBR AN 60
-=======
     I HAS A T ITZ QUOSHUNT OF SUM OF PRODUKT OF 43200 AN I AN 21600 AN 11
     I HAS A H ITZ QUOSHUNT OF T AN 3600
     I HAS A M ITZ MOD OF QUOSHUNT OF T AN 60 AN 60
->>>>>>> 46669ca57dfd8285176dd75c9b07113ebf39e9db
     I HAS A S ITZ MOD OF T AN 60
     BOTH SAEM H AN 0, O RLY?
       YA RLY, H R 12