Reminder: Yell at Leshana for not tagging edited code.

This commit is contained in:
Unknown
2019-03-27 20:03:23 -04:00
parent e105a047e1
commit a22ada82f1
2 changed files with 25 additions and 78 deletions

View File

@@ -242,8 +242,6 @@
/proc/isLeap(y)
return ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0))
<<<<<<< HEAD
=======
//Takes a string and a datum
//The string is well, obviously the string being checked
@@ -283,4 +281,3 @@
return strtype
return copytext(strtype, delim_pos)
>>>>>>> bfaaffb... Adds a better debug controller verb that can target all controllers/processes/mc/failsafe/config/etc (#5852)