Merge branch 'master' into fixed-comma-split

litmuschaos · Sep 24, 2022 · 6086c37 · 6086c37
2 parents cb7d9ac + a83f346
commit 6086c37
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/chaoslib/litmus/spring-boot-chaos/lib/spring-boot-chaos.go b/chaoslib/litmus/spring-boot-chaos/lib/spring-boot-chaos.go
@@ -4,22 +4,13 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-<<<<<<< HEAD
-=======
 	corev1 "k8s.io/api/core/v1"
->>>>>>> b877129 (Added experiment and lib for spring-boot (#511))
 	"net/http"
 	"os"
 	"os/signal"
 	"strings"
 	"syscall"
 	"time"
-
-<<<<<<< HEAD
-	corev1 "k8s.io/api/core/v1"
-
-=======
->>>>>>> b877129 (Added experiment and lib for spring-boot (#511))
 	"github.com/litmuschaos/litmus-go/pkg/clients"
 	"github.com/litmuschaos/litmus-go/pkg/events"
 	"github.com/litmuschaos/litmus-go/pkg/log"