From b09f5702e39d0f6fe0b5c1d90f356a993a093c8d Mon Sep 17 00:00:00 2001 From: Thibaud Date: Wed, 11 Apr 2018 16:01:04 +0200 Subject: [PATCH 1/3] fix merge --- test.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test.js b/test.js index 53bf9bc..c4a1f24 100644 --- a/test.js +++ b/test.js @@ -1,14 +1,7 @@ -<<<<<<< HEAD -export default (state = 'toto', action) => { - switch (action.type) { - case 'f2': - console.log('toto'); -======= export default (state = 'tata', action) => { switch (action.type) { case 'f1': console.log('tata'); ->>>>>>> f1 default: return state; } From e73de1ab3a7a99ba97bfb0abe1a5d960341b35a2 Mon Sep 17 00:00:00 2001 From: Thibaud Date: Tue, 17 Apr 2018 12:19:31 +0200 Subject: [PATCH 2/3] log f11 --- test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test.js b/test.js index b705438..e78e55c 100644 --- a/test.js +++ b/test.js @@ -13,3 +13,4 @@ export default (state = 'f9conflict', action) => { return state; } }; +console.log('f11'); From d7d7f4009a9c31538e2dadac22265d89a8ba6789 Mon Sep 17 00:00:00 2001 From: Thibaud Date: Tue, 17 Apr 2018 14:29:59 +0200 Subject: [PATCH 3/3] update test.js to log f13 --- test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.js b/test.js index 74a8935..e4813e8 100644 --- a/test.js +++ b/test.js @@ -13,4 +13,4 @@ export default (state = 'f9conflict', action) => { return state; } }; -console.log('f11'); +console.log('f13');