From 294862af40b249dedf21594312645eab0c1a6e68 Mon Sep 17 00:00:00 2001 From: Alberto Harres Rocha Date: Fri, 20 Nov 2015 17:22:28 -0200 Subject: [PATCH 1/2] Fix index file encoding Set file encoding to ut8 --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index f074549..a9e7b39 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,4 @@ - + @@ -24,7 +24,7 @@ From 9b2e66ebeaf7980d3f92b2cb8e6fbca6a5112e0f Mon Sep 17 00:00:00 2001 From: Guilherme Taschetto Date: Fri, 20 Nov 2015 17:21:47 -0200 Subject: [PATCH 2/2] Conflito pra Bruna --- contato.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 contato.html diff --git a/contato.html b/contato.html new file mode 100644 index 0000000..d6baf71 --- /dev/null +++ b/contato.html @@ -0,0 +1 @@ +OI AMIGUINHOS, VAMOS FAZER UM MERGE CONFLICT? \ No newline at end of file