diff --git a/2-september.txt b/2-september.txt new file mode 100644 index 0000000..e69de29 diff --git a/2018jan.txt b/2018jan.txt new file mode 100644 index 0000000..2d8261a --- /dev/null +++ b/2018jan.txt @@ -0,0 +1 @@ +new addition diff --git a/24october.txt b/24october.txt new file mode 100644 index 0000000..e69de29 diff --git a/abc.txt b/abc.txt index ad5a05a..4f1b475 100644 --- a/abc.txt +++ b/abc.txt @@ -1 +1,3 @@ +this is updated on 21st september + This is GitHUB file diff --git a/abcd-august.txt b/abcd-august.txt index e69de29..3e75765 100644 --- a/abcd-august.txt +++ b/abcd-august.txt @@ -0,0 +1 @@ +new diff --git a/december.txt b/december.txt new file mode 100644 index 0000000..e69de29 diff --git a/devops.txt b/devops.txt new file mode 100644 index 0000000..3e75765 --- /dev/null +++ b/devops.txt @@ -0,0 +1 @@ +new diff --git a/index.html b/index.html new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/index.html @@ -0,0 +1 @@ +test diff --git a/india.txt b/india.txt new file mode 100644 index 0000000..e69de29 diff --git a/june10.txt b/june10.txt new file mode 100644 index 0000000..e69de29 diff --git a/march25.txt b/march25.txt new file mode 100644 index 0000000..e69de29 diff --git a/master.txt b/master.txt new file mode 100644 index 0000000..e69de29 diff --git a/newoctober.txt b/newoctober.txt new file mode 100644 index 0000000..e69de29 diff --git a/november2017.txt b/november2017.txt new file mode 100644 index 0000000..e69de29 diff --git a/october.txt b/october.txt new file mode 100644 index 0000000..e69de29 diff --git a/september-new.txt b/september-new.txt new file mode 100644 index 0000000..e69de29 diff --git a/toctober.txt b/toctober.txt new file mode 100644 index 0000000..d93ad80 --- /dev/null +++ b/toctober.txt @@ -0,0 +1,4 @@ +<<<<<<< HEAD +conflict +======= +>>>>>>> 40d9b62f429af1f3f86f0f77365971f827f14df5 diff --git a/toctober.txt.orig b/toctober.txt.orig new file mode 100644 index 0000000..bb70b4a --- /dev/null +++ b/toctober.txt.orig @@ -0,0 +1,5 @@ +<<<<<<< HEAD +conflict +======= +master +>>>>>>> 40d9b62f429af1f3f86f0f77365971f827f14df5