From 652f921eb2475aa02dc29d5b4ebc59868576f659 Mon Sep 17 00:00:00 2001 From: Amanda Albuquerque Date: Sat, 29 Oct 2016 12:22:54 -0200 Subject: [PATCH 1/8] =?UTF-8?q?cria=C3=A7=C3=A3o=20de=20arquivo=20html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ html/idex.html | 0 2 files changed, 4 insertions(+) create mode 100644 html/idex.html diff --git a/README.md b/README.md index 11867eb..e13f133 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,7 @@ Repositório de testes para a oficina de Git Pages: [https://marialabhackerspace.github.io/oficina-git/](https://marialabhackerspace.github.io/oficina-git/) + +## amanda +teste de commit o/ + \ No newline at end of file diff --git a/html/idex.html b/html/idex.html new file mode 100644 index 0000000..e69de29 From f05be1e91c7fdcd3db2e9a5c50b29a6cc00f35ce Mon Sep 17 00:00:00 2001 From: Amanda Albuquerque Date: Sat, 29 Oct 2016 12:27:41 -0200 Subject: [PATCH 2/8] =?UTF-8?q?cria=C3=A7=C3=A3o=20de=20arquivo=20html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/idex.html | 0 html/index.html | 10 ++++++++++ 2 files changed, 10 insertions(+) delete mode 100644 html/idex.html create mode 100644 html/index.html diff --git a/html/idex.html b/html/idex.html deleted file mode 100644 index e69de29..0000000 diff --git a/html/index.html b/html/index.html new file mode 100644 index 0000000..670b1d3 --- /dev/null +++ b/html/index.html @@ -0,0 +1,10 @@ + + + + + Amanda - Oficina Git + + + + + \ No newline at end of file From 07b135e2e72ee7236ca17421ef8b040cebb79fc1 Mon Sep 17 00:00:00 2001 From: Amanda Albuquerque Date: Sat, 29 Oct 2016 14:02:18 -0200 Subject: [PATCH 3/8] Ajustes Branch --- amanda.md | 1 + html/index.html | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 amanda.md diff --git a/amanda.md b/amanda.md new file mode 100644 index 0000000..da07a75 --- /dev/null +++ b/amanda.md @@ -0,0 +1 @@ +Oi \ No newline at end of file diff --git a/html/index.html b/html/index.html index 670b1d3..ed3c034 100644 --- a/html/index.html +++ b/html/index.html @@ -5,6 +5,9 @@ Amanda - Oficina Git - +

Lorem Ipsom

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Blanditiis molestiae possimus vel tempore nisi omnis quis a assumenda molestias quo facere reiciendis id, vero distinctio rerum soluta neque, officiis debitis!

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Atque earum perferendis eveniet suscipit quas ea saepe accusamus, et provident. Ea illo nihil asperiores officia velit aspernatur, fugiat blanditiis vel porro! +

\ No newline at end of file From 5d77c7d34a7eb22941c305f87e795687d505420a Mon Sep 17 00:00:00 2001 From: Amanda Albuquerque Date: Sat, 29 Oct 2016 14:13:47 -0200 Subject: [PATCH 4/8] Versionamento de teste --- html/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/index.html b/html/index.html index 670b1d3..cadc2b1 100644 --- a/html/index.html +++ b/html/index.html @@ -5,6 +5,6 @@ Amanda - Oficina Git - +

Lorem Ipsum

\ No newline at end of file From 848bd3d739b4e1bda07d7b77045307334715be12 Mon Sep 17 00:00:00 2001 From: Amanda Albuquerque Date: Sat, 29 Oct 2016 15:03:09 -0200 Subject: [PATCH 5/8] teste --- html/index.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/html/index.html b/html/index.html index 3bab101..ed3c034 100644 --- a/html/index.html +++ b/html/index.html @@ -5,13 +5,9 @@ Amanda - Oficina Git -<<<<<<< HEAD -

Lorem Ipsum

-=======

Lorem Ipsom

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Blanditiis molestiae possimus vel tempore nisi omnis quis a assumenda molestias quo facere reiciendis id, vero distinctio rerum soluta neque, officiis debitis!

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Atque earum perferendis eveniet suscipit quas ea saepe accusamus, et provident. Ea illo nihil asperiores officia velit aspernatur, fugiat blanditiis vel porro!

->>>>>>> alalbuquerque \ No newline at end of file From d407d602e8e8398158953c34f18f027698ea3bd9 Mon Sep 17 00:00:00 2001 From: Amanda Albuquerque Date: Sat, 29 Oct 2016 15:11:32 -0200 Subject: [PATCH 6/8] testte --- html/index.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/html/index.html b/html/index.html index ed3c034..fc6b0f9 100644 --- a/html/index.html +++ b/html/index.html @@ -5,9 +5,7 @@ Amanda - Oficina Git -

Lorem Ipsom

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Blanditiis molestiae possimus vel tempore nisi omnis quis a assumenda molestias quo facere reiciendis id, vero distinctio rerum soluta neque, officiis debitis!

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Atque earum perferendis eveniet suscipit quas ea saepe accusamus, et provident. Ea illo nihil asperiores officia velit aspernatur, fugiat blanditiis vel porro! -

+

Lorem ipsum dolor sit amet

+

Lorem adipisicing elit. Blanditiis molestiae possimus vel tempore nisi omnis quis a assumenda molestias quo facere reiciendis id, vero distinctio rerum soluta neque, officiis debitis!

\ No newline at end of file From 6f92a42c4a619e930e8901c799ef080f484cdcee Mon Sep 17 00:00:00 2001 From: Amanda Albuquerque Date: Sat, 29 Oct 2016 15:12:09 -0200 Subject: [PATCH 7/8] testte2 --- html/index.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/html/index.html b/html/index.html index ed3c034..b6e059a 100644 --- a/html/index.html +++ b/html/index.html @@ -5,9 +5,7 @@ Amanda - Oficina Git -

Lorem Ipsom

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Blanditiis molestiae possimus vel tempore nisi omnis quis a assumenda molestias quo facere reiciendis id, vero distinctio rerum soluta neque, officiis debitis!

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Atque earum perferendis eveniet suscipit quas ea saepe accusamus, et provident. Ea illo nihil asperiores officia velit aspernatur, fugiat blanditiis vel porro! -

+

Lorem Ipsom reiciendis

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Blanditiis molestiae possimus vel tempore nisi omnis quis a assumenda molestias quo facere id, vero distinctio rerum soluta neque, officiis debitis!

\ No newline at end of file From e2900b1522310219a4a8c43d3e3d215d7221f064 Mon Sep 17 00:00:00 2001 From: Amanda Albuquerque Date: Sat, 29 Oct 2016 15:44:01 -0200 Subject: [PATCH 8/8] teste pro fork --- .gitignore | 1 + amanda.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bf0824e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.log \ No newline at end of file diff --git a/amanda.md b/amanda.md index da07a75..894413c 100644 --- a/amanda.md +++ b/amanda.md @@ -1 +1 @@ -Oi \ No newline at end of file +Oidadadada \ No newline at end of file