fuck

TODO.md

@@ -9,18 +9,27 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 1182532d (Bits)
 =======
 >>>>>>> 98cc9b57 (+ Added build scripts; Offered a fix for emacs mode;)
 =======
 >>>>>>> c49bc11b (Did a few things:)
 =======
+>>>>>>> 1d7ed6f866e5e6a5284b8201331e166b8b3f0d72
+=======
 >>>>>>> 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.
@@ -31,8 +40,13 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c49bc11b (Did a few things:)
+=======
+=======
+>>>>>>> f5becf8e2e35e02de41ec478713d2bcf0aedcd78
+>>>>>>> 1d7ed6f866e5e6a5284b8201331e166b8b3f0d72
 - [ ] 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.
@@ -54,10 +68,14 @@
 >>>>>>> c49bc11b (Did a few things:)
 =======
 - [ ] 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

@@ -51,8 +51,13 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> c49bc11b (Did a few things:)
+=======
+=======
+>>>>>>> f5becf8e2e35e02de41ec478713d2bcf0aedcd78
+>>>>>>> 1d7ed6f866e5e6a5284b8201331e166b8b3f0d72
 (defconst links-backup-keywords
 =======
 ;; TODO We should do that automatically as part of the build process somehow.
@@ -71,10 +76,14 @@
 >>>>>>> c49bc11b (Did a few things:)
 =======
 (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"