#79

extratone · Mar 30, 2021 · bb1a05d · bb1a05d
1 parent a2ebc06
commit bb1a05d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/documentation/lastscopes.md b/documentation/lastscopes.md
@@ -8,6 +8,7 @@ https://www.pscp.tv/w/1nAJELRkqByGL
 
 https://www.pscp.tv/w/1lPKqXnYapMxb
 
+<<<<<<< Updated upstream
 - https://www.pscp.tv/w/cy6EYjU0ODY4ODB8MXluSk9CQWtXbXZHUryBLCEuLwI5a9kn5CHUddJ3v1AjySBqRmJb_r-4D709
 - https://www.pscp.tv/w/cy6ICTU0ODY4ODB8MXluSk9CQWtvdm5HUu0sa8MIr59tvC5begZjIz8AvGmH0FaGJvXKCK1kORzI
 - https://www.pscp.tv/w/cy6I-TU0ODY4ODB8MUJSS2pCckFvZ1ZLdw7rha8BTDG5bbB_pDEafZleSqYpQPbZQSv2_fGjgZH6
@@ -24,4 +25,7 @@ https://www.pscp.tv/w/1lPKqXnYapMxb
 - https://happs.tv/invite/@TimothyDavidTV
 - https://www.pscp.tv/w/cy6KzzU0ODY4ODB8MWt2SnBvV3FrUWtHRVs5SBdnbNi4wpZoH4dFyb55Jp6TQmElvkKHfhUZAOTB
 - https://www.pscp.tv/w/cy6JdDU0ODY4ODB8MXluS09Cb3lxdkF4UsxbjkyYI9BvdKLeZbmqoJR-yXhxm0N5x-7hxOPuAseP
-- https://www.pscp.tv/w/cy6JZzU0ODY4ODB8MVJEeGxQZG9SbXJ4TI1tyBiLHNhzSnQ6XJDP24u8q4DJcyF_Tw0SOILcDlae
+- https://www.pscp.tv/w/cy6JZzU0ODY4ODB8MVJEeGxQZG9SbXJ4TI1tyBiLHNhzSnQ6XJDP24u8q4DJcyF_Tw0SOILcDlae
+=======
+https://www.pscp.tv/w/1gqGvopRRNkJB
+>>>>>>> Stashed changes