swkBerlin · N2late · Dec 14, 2020 · Dec 14, 2020 · Dec 14, 2020 · Dec 14, 2020
diff --git a/EH-LJ.test b/EH-LJ.test
diff --git a/MS-LJ.test b/MS-LJ.test
diff --git a/README.md b/README.md
@@ -29,6 +29,7 @@ You are welcome to contribute by submitting likewise a min setup for your langua
 ----
 [Cookiecutter](https://github.com/audreyr/cookiecutter) has a similar goal and also supports multiple languages for setting up a bare project.
 
+<<<<<<< HEAD
 [java-ci-badge]:../../../kata-bootstraps/workflows/Java%20CI/badge.svg "CI build status"
 [php-ci-badge]:../../../kata-bootstraps/workflows/PHP%20CI/badge.svg "CI build status"
 [rust-ci-badge]:../../../kata-bootstraps/workflows/Rust%20CI/badge.svg "CI build status"
@@ -39,3 +40,18 @@ You are welcome to contribute by submitting likewise a min setup for your langua
 [go-ci-badge]:../../../kata-bootstraps/workflows/GO%20CI/badge.svg "CI build status"
 [ruby-ci-badge]:../../../kata-bootstraps/workflows/Ruby%20CI/badge.svg "CI build status"
 [ci-actions]:../../../kata-bootstraps/actions
+=======
+[java-ci-badge]:https://github.com/swkBerlin/kata-bootstraps/workflows/Java%20CI/badge.svg "CI build status"
+[php-ci-badge]:https://github.com/swkBerlin/kata-bootstraps/workflows/PHP%20CI/badge.svg "CI build status"
+[rust-ci-badge]:https://github.com/swkBerlin/kata-bootstraps/workflows/Rust%20CI/badge.svg "CI build status"
+[python-ci-badge]:https://github.com/swkBerlin/kata-bootstraps/workflows/Python%20CI/badge.svg "CI build status"
+[scala-ci-badge]:https://github.com/swkBerlin/kata-bootstraps/workflows/Scala%20CI/badge.svg "CI build status"
+[js-ci-badge]:https://github.com/swkBerlin/kata-bootstraps/workflows/js%20CI/badge.svg "CI build status"
+[ts-ci-badge]:https://github.com/swkBerlin/kata-bootstraps/workflows/ts%20CI/badge.svg "CI build status"
+[go-ci-badge]:https://github.com/swkBerlin/kata-bootstraps/workflows/GO%20CI/badge.svg "CI build status"
+<<<<<<< HEAD
+[ci-actions]:https://github.com/swkBerlin/kata-bootstraps/actions
+>>>>>>> 06f01f1016fb99e97882a042564c4b7539b6b3cd
+=======
+[ci-actions]:https://github.com/swkBerlin/kata-bootstraps/actions
+>>>>>>> 06f01f1016fb99e97882a042564c4b7539b6b3cd
diff --git a/a.test.txt b/a.test.txt
@@ -0,0 +1,7 @@
+foo
+bar
+baz
+ha
+ha2
+hello world!
+
diff --git a/asdf.test.txt b/asdf.test.txt
diff --git a/csharp/dotnet-core5/Kata.Tests/Advanced/BusinessControllerTests.cs b/csharp/dotnet-core5/Kata.Tests/Advanced/BusinessControllerTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using Kata.Advanced;
 using NSubstitute;
 using Xunit;

diff --git a/csharp/dotnet-core5/Kata/Advanced/BusinessController.cs b/csharp/dotnet-core5/Kata/Advanced/BusinessController.cs
@@ -1,4 +1,4 @@
-namespace Kata.Advanced
+namespace Kata.Advanced
 {
     public class BusinessController
     {

diff --git a/csharp/dotnet-core5/Kata/Advanced/BusinessEntity.cs b/csharp/dotnet-core5/Kata/Advanced/BusinessEntity.cs
@@ -1,4 +1,4 @@
-namespace Kata.Advanced
+namespace Kata.Advanced
 {
     public class BusinessEntity : EntityBase
     {

diff --git a/csharp/dotnet-core5/Kata/Advanced/BusinessRepository.cs b/csharp/dotnet-core5/Kata/Advanced/BusinessRepository.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Kata.Advanced
 {

diff --git a/csharp/dotnet-core5/Kata/Advanced/EntityBase.cs b/csharp/dotnet-core5/Kata/Advanced/EntityBase.cs
@@ -1,4 +1,4 @@
-namespace Kata.Advanced
+namespace Kata.Advanced
 {
     public class EntityBase
     {

diff --git a/csharp/dotnet-core5/Kata/Advanced/IBusinessEntityService.cs b/csharp/dotnet-core5/Kata/Advanced/IBusinessEntityService.cs
@@ -1,4 +1,4 @@
-namespace Kata.Advanced
+namespace Kata.Advanced
 {
     public interface IBusinessEntityService
     {

diff --git a/csharp/dotnet-core5/Kata/Advanced/IRepository.cs b/csharp/dotnet-core5/Kata/Advanced/IRepository.cs
@@ -1,4 +1,4 @@
-namespace Kata.Advanced
+namespace Kata.Advanced
 {
     public interface IRepository<T> where T : EntityBase
     {

diff --git a/csharp/dotnet-core5/Kata/HelloWorld.cs b/csharp/dotnet-core5/Kata/HelloWorld.cs
@@ -1,4 +1,4 @@
-namespace Kata
+namespace Kata
 {
     public class HelloWorld
     {

diff --git a/csharp/dotnet-core5/dotnet-core5.sln b/csharp/dotnet-core5/dotnet-core5.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0

diff --git a/d.test.txt b/d.test.txt
diff --git a/def.txt b/def.txt
@@ -0,0 +1,8 @@
+test 123
+test 456
+test matej1
+test ben
+test adam
+test norbert
+test slu2
+test valeriya
diff --git a/dummy b/dummy
diff --git a/e.test.txt b/e.test.txt
diff --git a/elixir/README.md b/elixir/README.md
@@ -25,3 +25,4 @@ Mix has a lot more to offer, thy this if you want to learn more:
     mix help
 
 Welcome to the friendly world of Elixir! (♥͡_♥͡)
+
diff --git a/funFact.txt b/funFact.txt
@@ -0,0 +1 @@
+# It worked!
diff --git a/golang/testify/kata_test.go b/golang/testify/kata_test.go
@@ -7,6 +7,7 @@ import (
 
 func TestFailing(t *testing.T) {
 	assert.Equal(t, 42, doSomething("a"), "I'm failing you can start with me...")
+
 }
 
 func TestSomething(t *testing.T) {

diff --git a/java/README.md b/java/README.md
@@ -24,5 +24,15 @@ Java >= _1.8_
   * [cucumber](cucumber)
   * [fitnesse](fitnesse)
 
+<<<<<<< HEAD
   [java-ci-badge]:../../../../kata-bootstraps/workflows/Java%20CI/badge.svg "CI build status"
   [ci-actions]:../../../../kata-bootstraps/actions
+=======
+  [java-ci-badge]:https://github.com/swkBerlin/kata-bootstraps/workflows/Java%20CI/badge.svg "CI build status"
+  [ci-actions]: https://github.com/swkBerlin/kata-bootstraps/actions
+<<<<<<< HEAD
+Testing push
+>>>>>>> 06f01f1016fb99e97882a042564c4b7539b6b3cd
+=======
+Testing push
+>>>>>>> 06f01f1016fb99e97882a042564c4b7539b6b3cd
diff --git a/java/junit4/src/test/java/ThingTest.java b/java/junit4/src/test/java/ThingTest.java
@@ -7,7 +7,7 @@ public class ThingTest {
     public void it_should_call_for_action() {
         Thing thing = new Thing();
         String value = thing.callForAction();
-        assertEquals("Food", value);
+        assertEquals("Test", value);
     }
 
     @Test

diff --git a/java/junit5/README.md b/java/junit5/README.md
@@ -8,8 +8,10 @@ You can use [gradle](https://gradle.org/) or [maven](https://maven.apache.org/)
 
 ## Setup
 
-    git clone https://github.com/swkBerlin/kata-bootstraps
-    cd java/junit5
+```
+git clone https://github.com/swkBerlin/kata-bootstraps
+cd java/junit5
+```
 
 Open as preexisting project in your favorite IDE and choose between gradle or maven nature
 

diff --git a/js/jasmine/README.md b/js/jasmine/README.md
@@ -16,4 +16,4 @@ Open folder in editor or IDE
 
 `<any modern browser>` SpecRunner.html
 
-It might work with other setups, but that is not tested. Pull requests welcome!
+It might work with other setups, but that is not tested. Pull requests welcome!!!
diff --git a/js/jasmine/SpecRunner.html b/js/jasmine/SpecRunner.html
@@ -11,6 +11,7 @@
   <script src="lib/jasmine-2.2.0/jasmine-html.js"></script>
   <script src="lib/jasmine-2.2.0/boot.js"></script>
 
+
   <!-- include source files here... -->
   <script src="src/HelloWorld.js"></script>
 

diff --git a/js/jest-tests/README.md b/js/jest-tests/README.md
@@ -28,4 +28,6 @@ npm run test:watch
 npm run test:cover
 ```
 
-Note: coverage is also included in watch mode.
+Note: coverage is also included in watch mode.
+
+To push or not to push.
diff --git a/nw b/nw
diff --git a/php/src/Kata.php b/php/src/Kata.php
@@ -6,5 +6,8 @@
 
 class Kata
 {
-
+	public function test() {
+		return 'test';
+	}
 }
+// test push
diff --git a/php/test.txt b/php/test.txt
@@ -0,0 +1 @@
+push
diff --git a/php/tests/KataTest.php b/php/tests/KataTest.php
@@ -11,8 +11,16 @@ class KataTest extends TestCase
 {
     public function testDummy(): void
     {
+<<<<<<< HEAD
+<<<<<<< HEAD
         $kata = new Kata();
         $this->assertInstanceOf(Kata::class, $kata);
+=======
+        $kat = new Kata();
+>>>>>>> 06f01f1016fb99e97882a042564c4b7539b6b3cd
+=======
+        $kat = new Kata();
+>>>>>>> 06f01f1016fb99e97882a042564c4b7539b6b3cd
         $this->assertTrue(false);
     }
 

diff --git a/python/pytest/tests/test_fail.py b/python/pytest/tests/test_fail.py
@@ -0,0 +1,2 @@
+def test_():
+    assert False
diff --git a/test.txt b/test.txt
@@ -0,0 +1 @@
+test
diff --git a/test_file b/test_file
@@ -0,0 +1,3 @@
+Test push.
+
+
diff --git a/test_nwarzagier b/test_nwarzagier
diff --git a/test_push b/test_push
@@ -0,0 +1 @@
+Test.