From cf6cb16266769f37af6017b118fd76305a5ffc67 Mon Sep 17 00:00:00 2001 From: Daniel Soto Date: Thu, 22 Apr 2021 09:17:35 -0400 Subject: [PATCH 1/4] feat: first lorem ipsum --- example.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 example.txt diff --git a/example.txt b/example.txt new file mode 100644 index 0000000..c87189e --- /dev/null +++ b/example.txt @@ -0,0 +1,10 @@ +Lorem Ipsum is simply dummy text of the printing and typesetting industry. +Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, +when an unknown printer took a galley of type and scrambled it to make a type +specimen book. It has survived not only five centuries, but also the leap into +electronic typesetting, remaining essentially unchanged. It was popularised in +the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, +and more recently with desktop publishing software like Aldus PageMaker including +versions of Lorem Ipsum. + +this is an example \ No newline at end of file From 11c04220eefac6cbcc8b9e4f1abc2513e041938c Mon Sep 17 00:00:00 2001 From: Luciana Moll Date: Thu, 22 Apr 2021 10:36:06 -0300 Subject: [PATCH 2/4] feat: add new example --- example.txt | 4 +++- example2.txt | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 example2.txt diff --git a/example.txt b/example.txt index c87189e..105115f 100644 --- a/example.txt +++ b/example.txt @@ -7,4 +7,6 @@ the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. -this is an example \ No newline at end of file +this is an example + +see a new example in example2.txt \ No newline at end of file diff --git a/example2.txt b/example2.txt new file mode 100644 index 0000000..464a9ee --- /dev/null +++ b/example2.txt @@ -0,0 +1,8 @@ +It is a long established fact that a reader will be +distracted by the readable content of a page when looking at its layout. +The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, +as opposed to using 'Content here, content here', making it look like readable English. Many +desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, +and a search for 'lorem ipsum' will uncover many web sites still in their infancy. +Various versions have evolved over the years, sometimes by accident, sometimes on purpose +(injected humour and the like). \ No newline at end of file From 9698ab73c37cfaa2241cf37ce666f9cc3648d963 Mon Sep 17 00:00:00 2001 From: Daniel Soto Date: Thu, 22 Apr 2021 09:55:44 -0400 Subject: [PATCH 3/4] feat: modifying for conflicts --- example.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/example.txt b/example.txt index 105115f..ed03894 100644 --- a/example.txt +++ b/example.txt @@ -1,9 +1,10 @@ Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type -specimen book. It has survived not only five centuries, but also the leap into +specimen book. It has survived not only five centuries, but also the leap + into electronic typesetting, remaining essentially unchanged. It was popularised in -the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, +the 1960s with the release of Letraset sheets containing Lorem Ipsum, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. From 6e34edbca5180f46ae03a534c47d065de444780c Mon Sep 17 00:00:00 2001 From: Luciana Moll Date: Thu, 22 Apr 2021 11:00:59 -0300 Subject: [PATCH 4/4] remove a part --- example.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/example.txt b/example.txt index 105115f..92b8131 100644 --- a/example.txt +++ b/example.txt @@ -1,11 +1,7 @@ Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type -specimen book. It has survived not only five centuries, but also the leap into -electronic typesetting, remaining essentially unchanged. It was popularised in -the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, -and more recently with desktop publishing software like Aldus PageMaker including -versions of Lorem Ipsum. +specimen book. this is an example