diff --git a/CHIcken.txt b/CHIcken.txt new file mode 100644 index 0000000..b446112 --- /dev/null +++ b/CHIcken.txt @@ -0,0 +1,7 @@ +THIS isisisisisisis epic +<<<<<<< HEAD +ok second testadad +======= +awawdawd +>>>>>>> dd57a1a908480aa9f80c72b88a147201a176def5 +Hello from my new branch! \ No newline at end of file diff --git a/COMPSVII-ExampleRepo b/COMPSVII-ExampleRepo new file mode 160000 index 0000000..dd57a1a --- /dev/null +++ b/COMPSVII-ExampleRepo @@ -0,0 +1 @@ +Subproject commit dd57a1a908480aa9f80c72b88a147201a176def5 diff --git a/RIZEWEB b/RIZEWEB new file mode 160000 index 0000000..783f11b --- /dev/null +++ b/RIZEWEB @@ -0,0 +1 @@ +Subproject commit 783f11bb82eab0d4db4c767c552786b3869957b9