idk

TODO.md

@@ -1,18 +1,25 @@
 # TODO (yung-turabian)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
 >>>>>>> 1182532d (Bits)
+=======
+>>>>>>> 2911575b2c8252d323041ae45a1b530b69908e8d
 - [-] Add some test cases.
 - [ ] Have type inference convert, for example, int to float in a operation like 2.0 + 2? Hide behind an experimental guard if so.
 - [ ] Singleton kinds, they classify type cons by reavling their identity.
     - [ ] Higher singletons, S(c :: k) where k is a kind and c is a constructor of kind k.
 <<<<<<< HEAD
+<<<<<<< HEAD
 - [ ] If given the ability to create new subkinds, then just force the creation to derive from one of the three 'base' (Type, Row, Presnece) or even one of their subkinds such as "Base."
 =======
 - [ ] Add some test cases.
 >>>>>>> 1765e705 (Created TODO.md)
 =======
 - [ ] If given the ability to create new subkinds, then just force the creation to derive from one of the three 'base' (Type, Row, Presnece) or even one of their subkinds such as "Base."
 >>>>>>> 1182532d (Bits)
+=======
+- [ ] If given the ability to create new subkinds, then just force the creation to derive from one of the three 'base' (Type, Row, Presnece) or even one of their subkinds such as "Base."
+>>>>>>> 2911575b2c8252d323041ae45a1b530b69908e8d

links-mode.el

@@ -46,13 +46,17 @@
 
 ;; Can be generated with `links --print-keywords`.
 <<<<<<< HEAD
+<<<<<<< HEAD
 (defconst links-backup-keywords
 =======
 ;; TODO We should do that automatically as part of the build process somehow.
 
 ;; ./links --print-keywords | awk '{ print "\""$0"\""}'
 (defconst links-keywords
 >>>>>>> 7518d311 (Fixing emacs script)
+=======
+(defconst links-backup-keywords
+>>>>>>> 2911575b2c8252d323041ae45a1b530b69908e8d
   '(
     "alien"
     "as"