diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..e43b0f98895 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/README.md b/README.md index 06bb023212b..bd0fa186929 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,22 @@ -# Starter Web Repo +# sStarter Web Repo This repository is for showing how Git and GitHub work ## Purpose -Sample website with plenty of files for demos \ No newline at end of file +Sample website with plenty of files for demos +simple change +#starter project + new line and update +##introductiom + copywite noticd +##purpose + +##how to cont + +#new change + +#copyright +git traning + +#merge diff --git a/human.txt b/human.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/humans.txt b/humans.txt index 5b037cf2e10..b5a03e67f48 100644 --- a/humans.txt +++ b/humans.txt @@ -1,6 +1,6 @@ # humanstxt.org/ # The humans responsible & technology colophon - +hy am satya stash # TEAM -- -- diff --git a/index.html b/index.html index 01f983f454c..b4b86a3db41 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,15 @@ - +<<<<<<< Updated upstream +<<<<<<< Updated upstream + titlr for tagging Wxample +======= + stash +>>>>>>> Stashed changes +======= + changed the title +>>>>>>> Stashed changes @@ -24,7 +32,7 @@