Fixed merge conflicts in testing.txt

MolSSI-Education · Dec 5, 2023 · efe8747 · efe8747
1 parent 416bab3
commit efe8747
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/testing.txt b/testing.txt
@@ -1,10 +1,10 @@
 ***************************************
-This is	the start of testing.txt
+This is the start of testing.txt
 ***************************************
 
 I added this file from a new clone!
 Now I added a new line!
 
 ***************************************
-This is	the end	of testing.txt
-***************************************
+This is the end of testing.txt
+***************************************