From 07e76438f7842135277124f0493d662cccdc7ef0 Mon Sep 17 00:00:00 2001 From: Vladislav Nikov Date: Tue, 4 Dec 2018 03:03:36 +0200 Subject: [PATCH 1/4] add git flow --- registration.js | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 registration.js diff --git a/registration.js b/registration.js new file mode 100644 index 0000000..7a9840a --- /dev/null +++ b/registration.js @@ -0,0 +1,3 @@ +function reg() { + console.log("reg"); +} \ No newline at end of file From 712e1ba16ddb017716ef812d096cf310122e90bf Mon Sep 17 00:00:00 2001 From: Vladislav Nikov Date: Tue, 4 Dec 2018 03:13:16 +0200 Subject: [PATCH 2/4] hotfix 1 --- registration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registration.js b/registration.js index 7a9840a..20be3b4 100644 --- a/registration.js +++ b/registration.js @@ -1,3 +1,3 @@ function reg() { - console.log("reg"); + console.log("reg!!!"); } \ No newline at end of file From a14642bbb977325d0b03aeb149ae85ec7c351abd Mon Sep 17 00:00:00 2001 From: Vladislav Nikov Date: Tue, 4 Dec 2018 03:26:21 +0200 Subject: [PATCH 3/4] new conflict --- auth.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/auth.js b/auth.js index bca35c8..789c007 100644 --- a/auth.js +++ b/auth.js @@ -1,3 +1,4 @@ function auth() { - console.log("authenticate"); + console.log("lol..."); + console.log("authenticate..."); } \ No newline at end of file From 26fd75e3bf1deed1c39d049889ce3ba40fe29f49 Mon Sep 17 00:00:00 2001 From: Vladislav Nikov Date: Tue, 4 Dec 2018 03:27:29 +0200 Subject: [PATCH 4/4] new conflict 1 --- auth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auth.js b/auth.js index bca35c8..8ac40fc 100644 --- a/auth.js +++ b/auth.js @@ -1,3 +1,3 @@ function auth() { - console.log("authenticate"); + console.log("lolka"); } \ No newline at end of file