diff --git a/about.html b/about.html new file mode 100644 index 00000000..01814083 --- /dev/null +++ b/about.html @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/branchfile.txt b/branchfile.txt new file mode 100644 index 00000000..8ef1dd87 --- /dev/null +++ b/branchfile.txt @@ -0,0 +1 @@ +"This is a new file in branch" diff --git a/hello.txt b/hello.txt new file mode 100644 index 00000000..3348efd8 --- /dev/null +++ b/hello.txt @@ -0,0 +1,25 @@ +hello + +ezt én is átírom + +meg mégegy sort + +======= + +szia Bela, +ez az elso kollaboracionk. + +most csinaltam nehany valtoztatast ezzel a szoveggel. + +Geza + +======= + +ez megint valtoztatas + +======= + +2. modosíttttaaaaassssss + + +>>>>>>> 654ca39d76996ba2baef08086d7f8398eac841d9 diff --git a/css/6.jpg b/images/6.jpg similarity index 100% rename from css/6.jpg rename to images/6.jpg diff --git a/sorted_index.html b/sorted_index.html new file mode 100644 index 00000000..9c94b38d --- /dev/null +++ b/sorted_index.html @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/task.txt b/task.txt new file mode 100644 index 00000000..dbcd3bd6 --- /dev/null +++ b/task.txt @@ -0,0 +1,4 @@ +1 setup the environment +2 basic terminal operations +3 redirections +4 manipulations diff --git a/css/7.jpg b/temp_images/1.jpg similarity index 100% rename from css/7.jpg rename to temp_images/1.jpg diff --git a/temp_images/2.jpg b/temp_images/2.jpg new file mode 100644 index 00000000..dc11fc40 Binary files /dev/null and b/temp_images/2.jpg differ diff --git a/temp_images/3.jpg b/temp_images/3.jpg new file mode 100644 index 00000000..dc11fc40 Binary files /dev/null and b/temp_images/3.jpg differ diff --git a/temp_images/4.jpg b/temp_images/4.jpg new file mode 100644 index 00000000..dc11fc40 Binary files /dev/null and b/temp_images/4.jpg differ diff --git a/temp_images/5.jpg b/temp_images/5.jpg new file mode 100644 index 00000000..dc11fc40 Binary files /dev/null and b/temp_images/5.jpg differ