From fe0f26218a4fbe04df9047ca21a12dbd7920be8c Mon Sep 17 00:00:00 2001 From: Zemtsova Anna Date: Mon, 4 Mar 2019 11:57:27 +0200 Subject: [PATCH 1/5] test --- .idea/vcs.xml | 6 ++++++ src/Hello.html | 10 ++++++++++ 2 files changed, 16 insertions(+) create mode 100644 .idea/vcs.xml create mode 100644 src/Hello.html diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Hello.html b/src/Hello.html new file mode 100644 index 0000000..f7e5884 --- /dev/null +++ b/src/Hello.html @@ -0,0 +1,10 @@ + + + + + $Title$ + + +$END$ + + \ No newline at end of file From 1d472316fc9f07847f44a5d9f68ae37bedc69fdb Mon Sep 17 00:00:00 2001 From: Zemtsova Anna Date: Mon, 4 Mar 2019 12:00:01 +0200 Subject: [PATCH 2/5] pullR --- src/Hello.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Hello.html b/src/Hello.html index f7e5884..71506c4 100644 --- a/src/Hello.html +++ b/src/Hello.html @@ -2,9 +2,9 @@ - $Title$ + Hello -$END$ + \ No newline at end of file From 717902dc19cef21ef109494411752a39c8738506 Mon Sep 17 00:00:00 2001 From: Zemtsova Anna Date: Mon, 4 Mar 2019 12:04:29 +0200 Subject: [PATCH 3/5] -idea --- .idea/vcs.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 6d839c57bc6747e8047f30a0ccf38d1eda3ef473 Mon Sep 17 00:00:00 2001 From: Zemtsova Anna Date: Mon, 4 Mar 2019 12:28:01 +0200 Subject: [PATCH 4/5] pR --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a3b49b2..0fcb4b4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # kr2015 Clone this for course project and earn points for committing :) See also http://github.com/dimalit/chatapp +:) \ No newline at end of file From 0c3e2e6cf49d246d17a40063684baa5ca9a92edc Mon Sep 17 00:00:00 2001 From: Zemtsova Anna Date: Mon, 4 Mar 2019 12:57:57 +0200 Subject: [PATCH 5/5] test1 --- src/Hello.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Hello.html b/src/Hello.html index 71506c4..2edee8e 100644 --- a/src/Hello.html +++ b/src/Hello.html @@ -2,7 +2,7 @@ - Hello + Hello1