TODO--

1 files changed, 0 insertions, 30 deletions

diff --git a/src/sledjchisl/NOTES.txt b/src/sledjchisl/NOTES.txt
index 9dde016..3a6b0fc 100644
--- a/src/sledjchisl/NOTES.txt
+++ b/src/sledjchisl/NOTES.txt
@@ -415,36 +415,6 @@ apt install libmariadbclient-dev libapache2-mod-fcgid libssl1.0-dev uuid-dev spa
 
 -------------------------------------------------------------------
 
-Merge it into OpenSim-SC.
-
-    Complication - I had already added the boxes + early sledjchisl.c to opensim-SC.
-        I may have to revert that lot, only a few minor commits, which are already part of the main boxes.
-        d9c772712e27c8e25fab0d17555a9bc11017a125
-        d4ea3e50173df1ad646bdb7dc802f5d320b7e511
-        10ed36b3452ce6373175112716b043047dc896a9
-        2f66c46e7ce18d60cd1f565880fb7762b3399ccb
-        34c5ee4c2a489a506e93d5b303fbc80b263747f0 is the commit that added it.
-        f9bfa831d1ccaa973c42042584510e1a724ddaef the one before it.
-        It's been pushed up to the sledjhamr.org repo.
-
-        git revert d9c772712e27c8e25fab0d17555a9bc11017a125 d4ea3e50173df1ad646bdb7dc802f5d320b7e511 10ed36b3452ce6373175112716b043047dc896a9 2f66c46e7ce18d60cd1f565880fb7762b3399ccb 34c5ee4c2a489a506e93d5b303fbc80b263747f0
-        git remote add -f boxes ~/MyLinux_3/TOYBOX/sledjchisl
-        git merge --allow-unrelated-histories boxes/master
-        git remote rm boxes
-
-
-https://medium.com/altcampus/how-to-merge-two-or-multiple-git-repositories-into-one-9f8a5209913f
-https://medium.com/@checko/merging-two-git-repositories-into-one-preserving-the-git-history-4e20d3fafa4e
-https://thoughts.t37.net/merging-2-different-git-repositories-without-losing-your-history-de7a06bba804
-https://blog.doismellburning.co.uk/merging-two-git-repositories/
-
-Other much more complicated variations.
-
-http://mbork.pl/2019-08-19_Transplanting_a_directory_to_another_Git_repository
-
-
--------------------------------------------------------------------
-
 Install / update / upgrade.
 
 I could keep the version number around.