diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..5b5a96eec3e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.bak +*.orig \ No newline at end of file diff --git a/README.md b/README.md index 06bb023212b..5aa8fc841b7 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,20 @@ This repository is for showing how Git and GitHub work +learning how to use git and gitlab together. +Making some changes or puting this text where while the changes made in other branch were not yet merged. updating for emergency fix after our stash. + +## Introduction +A bit more of text here. + +## How to Contribute +Just more and more dummytext. +Do some chnages +## Deployment +Ah soon it will be... ## Purpose -Sample website with plenty of files for demos \ No newline at end of file +Sample website with plenty of files for demos + +## Copyright +014 Git.training All rights reserved diff --git a/dumy.txt b/dumy.txt new file mode 100644 index 00000000000..d9fa369c8cb --- /dev/null +++ b/dumy.txt @@ -0,0 +1 @@ +Tralalalaal. \ No newline at end of file diff --git a/humans.txt b/humans.txt index 5b037cf2e10..03ae774745d 100644 --- a/humans.txt +++ b/humans.txt @@ -1,15 +1,15 @@ -# humanstxt.org/ -# The humans responsible & technology colophon - -# TEAM - - -- -- - -# THANKS - - - -# TECHNOLOGY COLOPHON - - HTML5, CSS3 - jQuery, Modernizr +team information tralala + +Adding some new text here additionaly. ijdlejdelj +djoedjeofe +de +fe +fef +efe +f + +thank you to all my student. added on the branch. + +Please leave a review if you like this course ! +# TECHNOLOGY +new section tryout -! \ No newline at end of file diff --git a/index.html b/index.html index 01f983f454c..aff2db2f2ca 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ - + Adding title for tagging example @@ -45,7 +45,7 @@
- + diff --git a/newfile_tralala.txt b/newfile_tralala.txt new file mode 100644 index 00000000000..b611d2f61f7 --- /dev/null +++ b/newfile_tralala.txt @@ -0,0 +1 @@ +wdöäedoedfoedkedope diff --git a/simple.html b/simple.html index ca5e908d98f..36b7b15a539 100644 --- a/simple.html +++ b/simple.html @@ -1,24 +1,26 @@ - - - - - - - - -
- -

- Just some content -

-
-
-

© Company 2014

-
- - + + Copyright notice!!!! + + + Updating title for tagging example. + + + + + +
+ +

+ Adding more importnant content here. +

+
+ + +