Merge branch 'subkind-overload' of https://github.com/yung-turabian/l…

…inks into subkind-overload

TODO.md

@@ -5,19 +5,29 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 1182532d (Bits)
 =======
 >>>>>>> 98cc9b57 (+ Added build scripts; Offered a fix for emacs mode;)
 =======
 >>>>>>> 1182532d (Bits)
+=======
+=======
+>>>>>>> 1182532d (Bits)
+=======
+>>>>>>> 2911575b2c8252d323041ae45a1b530b69908e8d
+>>>>>>> f5becf8e2e35e02de41ec478713d2bcf0aedcd78
 - [-] 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
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> f5becf8e2e35e02de41ec478713d2bcf0aedcd78
 - [ ] 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.
@@ -27,10 +37,14 @@
 >>>>>>> 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."
+<<<<<<< HEAD
 >>>>>>> 98cc9b57 (+ Added build scripts; Offered a fix for emacs mode;)
 =======
 - [ ] 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)
+=======
+>>>>>>> 2911575b2c8252d323041ae45a1b530b69908e8d
+>>>>>>> f5becf8e2e35e02de41ec478713d2bcf0aedcd78

links-mode.el

@@ -48,6 +48,9 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> f5becf8e2e35e02de41ec478713d2bcf0aedcd78
 (defconst links-backup-keywords
 =======
 ;; TODO We should do that automatically as part of the build process somehow.
@@ -57,10 +60,14 @@
 >>>>>>> 7518d311 (Fixing emacs script)
 =======
 (defconst links-backup-keywords
+<<<<<<< HEAD
 >>>>>>> 98cc9b57 (+ Added build scripts; Offered a fix for emacs mode;)
 =======
 (defconst links-backup-keywords
 >>>>>>> 1182532d (Bits)
+=======
+>>>>>>> 2911575b2c8252d323041ae45a1b530b69908e8d
+>>>>>>> f5becf8e2e35e02de41ec478713d2bcf0aedcd78
   '(
     "alien"
     "as"