From 46e0e9bee11258dac5510b09530ae5c769e5bfa1 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 18:11:45 -0300
Subject: [PATCH 01/31] add index.html

---
 index.html | Bin 0 -> 24 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 index.html

diff --git a/index.html b/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..ab2e2f0514d263bc57897880f08ac2b893a8d28e
GIT binary patch
literal 24
fcmezWFP|ZYA(26WA(x?)A&()2A)kSlfr|kEUtR^2

literal 0
HcmV?d00001


From a779ff0dcaeb1014103d4d76a376fa27b9ca4140 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 18:12:41 -0300
Subject: [PATCH 02/31] add index.html

---
 index.html | Bin 0 -> 24 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 index.html

diff --git a/index.html b/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..ab2e2f0514d263bc57897880f08ac2b893a8d28e
GIT binary patch
literal 24
fcmezWFP|ZYA(26WA(x?)A&()2A)kSlfr|kEUtR^2

literal 0
HcmV?d00001


From 3de38656a4b950ed828302769394d56b8d4dd6ea Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 18:17:48 -0300
Subject: [PATCH 03/31] add file

---
 conflito.txt | Bin 0 -> 6 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 conflito.txt

diff --git a/conflito.txt b/conflito.txt
new file mode 100644
index 0000000000000000000000000000000000000000..49cc8ef0e116cef009fe0bd72473a964bbd07f9b
GIT binary patch
literal 6
NcmezWkC%aq0RRg=0u=xN

literal 0
HcmV?d00001


From eb5d0ae8a0bf8dacd6b3a66a8f0cfba66d84b4e4 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 18:18:31 -0300
Subject: [PATCH 04/31] update file

---
 conflito.txt | Bin 6 -> 10 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/conflito.txt b/conflito.txt
index 49cc8ef0e116cef009fe0bd72473a964bbd07f9b..eee44f5a5689f6c539383216fa9502e8da318363 100644
GIT binary patch
literal 10
RcmezWFP|ZkftP`c0RR~!0_^|*

literal 6
NcmezWkC%aq0RRg=0u=xN


From 4889ca4c13ecc9d79f2e29d1deebce67f50923a3 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 18:19:32 -0300
Subject: [PATCH 05/31] clear

---
 conflito.txt | Bin 10 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 conflito.txt

diff --git a/conflito.txt b/conflito.txt
deleted file mode 100644
index eee44f5a5689f6c539383216fa9502e8da318363..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10
RcmezWFP|ZkftP`c0RR~!0_^|*


From 7d69b693611632fbd1447e5d2447478fc7cad517 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 18:29:45 -0300
Subject: [PATCH 06/31] add conflito.txt

---
 conflito.txt | Bin 0 -> 6 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 conflito.txt

diff --git a/conflito.txt b/conflito.txt
new file mode 100644
index 0000000000000000000000000000000000000000..49cc8ef0e116cef009fe0bd72473a964bbd07f9b
GIT binary patch
literal 6
NcmezWkC%aq0RRg=0u=xN

literal 0
HcmV?d00001


From 3f65ada8178eba46847f31869430f2586ffdffe3 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 18:32:55 -0300
Subject: [PATCH 07/31] add conflito.txt

---
 conflito.txt | Bin 6 -> 12 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/conflito.txt b/conflito.txt
index 49cc8ef0e116cef009fe0bd72473a964bbd07f9b..0bb4673b89d1c50197cce739d3651cd8027a4cff 100644
GIT binary patch
literal 12
TcmezWFP|ZYA(4TXfr|kEAua<^

literal 6
NcmezWkC%aq0RRg=0u=xN


From d0b111271e25531fe036cfe473924eb976559f43 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 18:34:15 -0300
Subject: [PATCH 08/31] change conflito.txt

---
 conflito.txt | Bin 12 -> 12 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/conflito.txt b/conflito.txt
index 0bb4673b89d1c50197cce739d3651cd8027a4cff..871e1a7bb077db396f30f60be477f6feafbe85d5 100644
GIT binary patch
literal 12
TcmezW&z~WO;UNPr0~Z4TBJKmR

literal 12
TcmezWFP|ZYA(4TXfr|kEAua<^


From c1aa7aa6401c53baf34662b7f9e590b994a8bcce Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 18:43:43 -0300
Subject: [PATCH 09/31] teste

---
 conflito.txt | Bin 12 -> 40 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/conflito.txt b/conflito.txt
index 871e1a7bb077db396f30f60be477f6feafbe85d5..3c23ab985653eb0a18e6e644cfcbf0e200bc133d 100644
GIT binary patch
literal 40
ccmezW&z~WO;UNPr0~bRHLn=ctn8f4(0M$YWDF6Tf

literal 12
TcmezW&z~WO;UNPr0~Z4TBJKmR


From 4abbf93734a9bae2876d9fdb4f7cfc1e5a2c344f Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 18:44:37 -0300
Subject: [PATCH 10/31] a

---
 index.html | Bin 24 -> 10 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/index.html b/index.html
index ab2e2f0514d263bc57897880f08ac2b893a8d28e..eee44f5a5689f6c539383216fa9502e8da318363 100644
GIT binary patch
literal 10
RcmezWFP|ZkftP`c0RR~!0_^|*

literal 24
fcmezWFP|ZYA(26WA(x?)A&()2A)kSlfr|kEUtR^2


From 6e92fb89fc261f3f3036feea1939284d79460881 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 18:48:51 -0300
Subject: [PATCH 11/31] oi

---
 index.html | Bin 10 -> 550 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/index.html b/index.html
index eee44f5a5689f6c539383216fa9502e8da318363..62e679059de4c2a4b2da6d3e950da2eaf637f5e3 100644
GIT binary patch
literal 550
zcmZ{iK~KU!6oltY;(w@|1@y*YAu%9{Cp|!d$4WQS1X+Xy!k-tvw^&3|(`37EXWq=b
zZjYZ%*Ba_c1C8~fXFVv>Tv6{@sIMzE<j!@*S+1qt)KgQQUGswD!HVxXL&YA4jz=wL
zKSL+iTAOrY3KKj>YN>nHsq3>eQ7d>}AKI$aF8NP6ndqK%pn%T`^$7Y(N{^yB1~Nt}
zTg~y2`Fhj^GZ^PIVV&y|HOp>YJ5;^)I0W*?f3)|o3eY({1$^t8@ov#sAvdHdNmIfr
zaae$EVA;;R?$p+8O)g`{#OZTefsSoTXLC7ql3InI?yN(O%Nucgmq4z=pP4K6Z`3q@
G{(>)GQB?l`

literal 10
RcmezWFP|ZkftP`c0RR~!0_^|*


From 5119cb0a86e314dd405d59b26715eb6d7e2a8058 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 19:25:34 -0300
Subject: [PATCH 12/31] teste

---
 conflito.txt | Bin 40 -> 0 bytes
 index.html   | Bin 550 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 conflito.txt
 delete mode 100644 index.html

diff --git a/conflito.txt b/conflito.txt
deleted file mode 100644
index 3c23ab985653eb0a18e6e644cfcbf0e200bc133d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40
ccmezW&z~WO;UNPr0~bRHLn=ctn8f4(0M$YWDF6Tf

diff --git a/index.html b/index.html
deleted file mode 100644
index 62e679059de4c2a4b2da6d3e950da2eaf637f5e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 550
zcmZ{iK~KU!6oltY;(w@|1@y*YAu%9{Cp|!d$4WQS1X+Xy!k-tvw^&3|(`37EXWq=b
zZjYZ%*Ba_c1C8~fXFVv>Tv6{@sIMzE<j!@*S+1qt)KgQQUGswD!HVxXL&YA4jz=wL
zKSL+iTAOrY3KKj>YN>nHsq3>eQ7d>}AKI$aF8NP6ndqK%pn%T`^$7Y(N{^yB1~Nt}
zTg~y2`Fhj^GZ^PIVV&y|HOp>YJ5;^)I0W*?f3)|o3eY({1$^t8@ov#sAvdHdNmIfr
zaae$EVA;;R?$p+8O)g`{#OZTefsSoTXLC7ql3InI?yN(O%Nucgmq4z=pP4K6Z`3q@
G{(>)GQB?l`


From 9dd1c305fc812b6d6a7ce0dc730dd0cdf7466129 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 19:35:03 -0300
Subject: [PATCH 13/31] add conflito.txt

---
 conflito.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 conflito.txt

diff --git a/conflito.txt b/conflito.txt
new file mode 100644
index 0000000..c5c1966
--- /dev/null
+++ b/conflito.txt
@@ -0,0 +1 @@
+ola tudo bem?
\ No newline at end of file

From 2add85431e649a1fd1410ab6f879f6348fc7f072 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 19:37:57 -0300
Subject: [PATCH 14/31] =?UTF-8?q?adicionando=20acentua=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conflito.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conflito.txt b/conflito.txt
index c5c1966..f67e2ec 100644
--- a/conflito.txt
+++ b/conflito.txt
@@ -1 +1 @@
-ola tudo bem?
\ No newline at end of file
+olá tudo bem?
\ No newline at end of file

From 7d5aaa39fee567f2469fcf981c98b1c9852abd63 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Sat, 2 Jul 2022 19:39:12 -0300
Subject: [PATCH 15/31] alterando o conteudo de conflito.txt

---
 conflito.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conflito.txt b/conflito.txt
index c5c1966..47baa7e 100644
--- a/conflito.txt
+++ b/conflito.txt
@@ -1 +1 @@
-ola tudo bem?
\ No newline at end of file
+olá, tudo bem?
\ No newline at end of file

From 84c4d9ef80f78c20ee4c743fef9f450d975f4ff7 Mon Sep 17 00:00:00 2001
From: Gian Souza <gian@exemplo.com>
Date: Mon, 4 Jul 2022 22:28:37 -0300
Subject: [PATCH 16/31] add github.txt

---
 github.txt | Bin 0 -> 26 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 github.txt

diff --git a/github.txt b/github.txt
new file mode 100644
index 0000000000000000000000000000000000000000..00e2c6c3e631ca2d93b8d753d338de1075028186
GIT binary patch
literal 26
hcmezWFP|ZY;UR+pLpnnyLkU9$Ln%WN11|#?0|0hB26O-b

literal 0
HcmV?d00001


From c271d23290260e9deb5c19aa87d143d0e98c1564 Mon Sep 17 00:00:00 2001
From: gcsfebactmp <108704962+gcsfebactmp@users.noreply.github.com>
Date: Mon, 4 Jul 2022 22:30:29 -0300
Subject: [PATCH 17/31] create new file

---
 arquivo_remoto.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 arquivo_remoto.txt

diff --git a/arquivo_remoto.txt b/arquivo_remoto.txt
new file mode 100644
index 0000000..72ec7fb
--- /dev/null
+++ b/arquivo_remoto.txt
@@ -0,0 +1 @@
+Olá git

From d6bedec6601f9c9f0de868529216ef4c4a402e64 Mon Sep 17 00:00:00 2001
From: pedrowrt <pedrowrt@gmail.com>
Date: Tue, 25 Jun 2024 18:50:31 -0300
Subject: [PATCH 18/31] =?UTF-8?q?inclus=C3=A3o=20de=20changelog.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .arquivo2.txt | 1 +
 arquivo.txt   | 1 +
 arquivo2.txt  | 1 +
 changelog.md  | 1 +
 4 files changed, 4 insertions(+)
 create mode 100644 .arquivo2.txt
 create mode 100644 arquivo.txt
 create mode 100644 arquivo2.txt
 create mode 100644 changelog.md

diff --git a/.arquivo2.txt b/.arquivo2.txt
new file mode 100644
index 0000000..4c52cf6
--- /dev/null
+++ b/.arquivo2.txt
@@ -0,0 +1 @@
+ola, tudo bem?
diff --git a/arquivo.txt b/arquivo.txt
new file mode 100644
index 0000000..80dc915
--- /dev/null
+++ b/arquivo.txt
@@ -0,0 +1 @@
+Olá mundo
diff --git a/arquivo2.txt b/arquivo2.txt
new file mode 100644
index 0000000..80dc915
--- /dev/null
+++ b/arquivo2.txt
@@ -0,0 +1 @@
+Olá mundo
diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..d2830b6
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1 @@
+changelog.md
\ No newline at end of file

From c2ad314f9b470d59f915954c7bfbb4bf46b985f5 Mon Sep 17 00:00:00 2001
From: pedrowrt <pedrowrt@gmail.com>
Date: Tue, 25 Jun 2024 19:32:34 -0300
Subject: [PATCH 19/31] adicionando um arquivo

---
 .DS_Store    | Bin 0 -> 6148 bytes
 changelog.md |  15 ++++++++++++++-
 teste.txt    |   1 +
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 .DS_Store
 create mode 100644 teste.txt

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/changelog.md b/changelog.md
index d2830b6..ffd01ca 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1 +1,14 @@
-changelog.md
\ No newline at end of file
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.0.1] - 2014-05-31
+
+### Added
+
+- Added arquivo.txt & arquivo2.txt
diff --git a/teste.txt b/teste.txt
new file mode 100644
index 0000000..4734ad1
--- /dev/null
+++ b/teste.txt
@@ -0,0 +1 @@
+ola

From 24bd70c0ca31b6e3b8c72a723a309d92ad8aac71 Mon Sep 17 00:00:00 2001
From: pedrowrt <pedrowrt@gmail.com>
Date: Tue, 25 Jun 2024 19:36:00 -0300
Subject: [PATCH 20/31] restauracao de teste.txt

---
 teste.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/teste.txt b/teste.txt
index 4734ad1..c2acd58 100644
--- a/teste.txt
+++ b/teste.txt
@@ -1 +1 @@
-ola
+olá, tudo bem?

From d733a83f0705a1a5736566b04f03730ecb56bcd4 Mon Sep 17 00:00:00 2001
From: pedrowrt <pedrowrt@gmail.com>
Date: Tue, 25 Jun 2024 19:40:44 -0300
Subject: [PATCH 21/31] Revert "restauracao de teste.txt"

This reverts commit 24bd70c0ca31b6e3b8c72a723a309d92ad8aac71.
---
 teste.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/teste.txt b/teste.txt
index c2acd58..4734ad1 100644
--- a/teste.txt
+++ b/teste.txt
@@ -1 +1 @@
-olá, tudo bem?
+ola

From 9e0d0a07a091ed1dcbefbc481f3077f27e564180 Mon Sep 17 00:00:00 2001
From: Pedro Werner <pedrowerner@Werners-MacBook-Pro.local>
Date: Thu, 27 Jun 2024 14:32:15 -0300
Subject: [PATCH 22/31] add new file

---
 .DS_Store    | Bin 6148 -> 0 bytes
 new_file.txt |   1 +
 2 files changed, 1 insertion(+)
 delete mode 100644 .DS_Store
 create mode 100644 new_file.txt

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

diff --git a/new_file.txt b/new_file.txt
new file mode 100644
index 0000000..cf63fb8
--- /dev/null
+++ b/new_file.txt
@@ -0,0 +1 @@
+sou um novo arquivo

From 73858dba595007875fff62d4871804ab03848de9 Mon Sep 17 00:00:00 2001
From: Pedro Werner <pedrowerner@werners-macbook-pro.local>
Date: Thu, 27 Jun 2024 15:49:30 -0300
Subject: [PATCH 23/31] add conflito.txt

---
 conflito.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 conflito.txt

diff --git a/conflito.txt b/conflito.txt
new file mode 100644
index 0000000..e69de29

From 90e7a1f4c089eb79e7d9bedbac9780a0e5833be9 Mon Sep 17 00:00:00 2001
From: Pedro Werner <pedrowerner@werners-macbook-pro.local>
Date: Thu, 27 Jun 2024 15:51:50 -0300
Subject: [PATCH 24/31] acento

---
 conflito.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conflito.txt b/conflito.txt
index e69de29..f67e2ec 100644
--- a/conflito.txt
+++ b/conflito.txt
@@ -0,0 +1 @@
+olá tudo bem?
\ No newline at end of file

From 1838cfa5fdbd16337639ffcde312a03ca8083eef Mon Sep 17 00:00:00 2001
From: Pedro Werner <pedrowerner@werners-macbook-pro.local>
Date: Thu, 27 Jun 2024 15:53:16 -0300
Subject: [PATCH 25/31] alterando virgula

---
 conflito.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conflito.txt b/conflito.txt
index f67e2ec..47baa7e 100644
--- a/conflito.txt
+++ b/conflito.txt
@@ -1 +1 @@
-olá tudo bem?
\ No newline at end of file
+olá, tudo bem?
\ No newline at end of file

From ac9112d9d08e1399c888470c6754c5eeb7678882 Mon Sep 17 00:00:00 2001
From: Pedro Werner <pedrowerner@werners-macbook-pro.local>
Date: Thu, 27 Jun 2024 15:56:15 -0300
Subject: [PATCH 26/31] interrogacao

---
 conflito.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conflito.txt b/conflito.txt
index 47baa7e..b95d225 100644
--- a/conflito.txt
+++ b/conflito.txt
@@ -1 +1 @@
-olá, tudo bem?
\ No newline at end of file
+olá, tudo bem??
\ No newline at end of file

From 9316fb9f3fa4fe0cd6b3d3f68de2174087129c51 Mon Sep 17 00:00:00 2001
From: Pedro Werner <pedrowerner@werners-macbook-pro.local>
Date: Thu, 27 Jun 2024 15:58:31 -0300
Subject: [PATCH 27/31] sem ?

---
 conflito.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conflito.txt b/conflito.txt
index b95d225..47baa7e 100644
--- a/conflito.txt
+++ b/conflito.txt
@@ -1 +1 @@
-olá, tudo bem??
\ No newline at end of file
+olá, tudo bem?
\ No newline at end of file

From 630a47bfedd3370e244685dbfd6131c5034b3c22 Mon Sep 17 00:00:00 2001
From: Pedro Werner <pedrowerner@werners-macbook-pro.local>
Date: Thu, 27 Jun 2024 15:59:53 -0300
Subject: [PATCH 28/31] sem ?

---
 .DS_Store    | Bin 0 -> 6148 bytes
 conflito.txt |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..1211f0b27574bfc46b0e4dc0465cec574fe6e5a3
GIT binary patch
literal 6148
zcmeHKyG{c!5S)b+L7_-VgXAxW1YdB8LP5<BKpqN_4o-vwQC`o-@QE<%T@d%E5kkAt
zde-)ieIDuj03fr&>H-)87}6C*gC5i7-mW809uOsuvBe82Ot8mm&p>~%NxyxBJM8d;
z1Ac!0{<^G|i?UiUL*<#$Cm-1u0jDk2rLViqd++d;xF`1!8>~@MuML?GST*O9^A_)f
zs;=>zOH;Ttlf1PUtcHaGp+G1Q3WNe31$btw4M&Dih615LDDbU-?hlEsSUA>(dFx=2
zp8!O?MrUKJmu2N7$HK8TWDiY@N;InY6GM#7_T+hmV{K@3h(A8WXa0J;NS>YJr<@Kc
z45JJMLV>0N$5tKd`G3V<ruUKGq(m(g2nGI`0y3E2%x7GbpRJwc=~<iTw{$hlt2Ll8
mZd?Lb(S77BcUphan0bX`ZK$JYd!`fPB9H}%A{6)q1wH}JcSW=S

literal 0
HcmV?d00001

diff --git a/conflito.txt b/conflito.txt
index b95d225..47baa7e 100644
--- a/conflito.txt
+++ b/conflito.txt
@@ -1 +1 @@
-olá, tudo bem??
\ No newline at end of file
+olá, tudo bem?
\ No newline at end of file

From 120e280038b93d7eb3f6d4c6ce270465764b3e25 Mon Sep 17 00:00:00 2001
From: Pedro Werner <pedrowerner@werners-macbook-pro.local>
Date: Thu, 27 Jun 2024 20:03:19 -0300
Subject: [PATCH 29/31] paragrafo novo

---
 conflito.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conflito.txt b/conflito.txt
index 47baa7e..f8bb1a4 100644
--- a/conflito.txt
+++ b/conflito.txt
@@ -1 +1,3 @@
-olá, tudo bem?
\ No newline at end of file
+olá, tudo bem?
+
+paragrafo novo

From a03333b3247a2ac3bf7238196b144254612bbffb Mon Sep 17 00:00:00 2001
From: Pedro Werner <2816056+pedrowrt@users.noreply.github.com>
Date: Thu, 27 Jun 2024 22:59:46 -0300
Subject: [PATCH 30/31] Update conflito.txt

---
 conflito.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conflito.txt b/conflito.txt
index f8bb1a4..5c78859 100644
--- a/conflito.txt
+++ b/conflito.txt
@@ -1,3 +1,3 @@
 olá, tudo bem?
 
-paragrafo novo
+paragrafo novo
\ No newline at end of file

From 2e08a3877ac2c3a0dcaced1f6677bfe34ba59973 Mon Sep 17 00:00:00 2001
From: Pedro Werner <2816056+pedrowrt@users.noreply.github.com>
Date: Thu, 27 Jun 2024 23:36:43 -0300
Subject: [PATCH 31/31] add github.txt

---
 github.txt | Bin 26 -> 12 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/github.txt b/github.txt
index 00e2c6c3e631ca2d93b8d753d338de1075028186..62ae8e61cd36f204433e4241e66af0214463a200 100644
GIT binary patch
literal 12
Tcmd1LIlNFIJ+maEG>HoUBZCC(

literal 26
hcmezWFP|ZY;UR+pLpnnyLkU9$Ln%WN11|#?0|0hB26O-b