Fixing conflicts

elastic · Jun 22, 2024 · 8286d6d · 8286d6d
1 parent de334eb
commit 8286d6d
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/filebeat/input/filestream/environment_test.go b/filebeat/input/filestream/environment_test.go
@@ -94,11 +94,7 @@ func (e *inputTestingEnvironment) mustCreateInput(config map[string]interface{})
 	e.t.Helper()
 	e.grp = unison.TaskGroup{}
 	manager := e.getManager()
-<<<<<<< HEAD
-	manager.Init(&e.grp, v2.ModeRun)
-=======
-	_ = manager.Init(&e.grp)
->>>>>>> 535a17418d (libbeat: add Offset to libbeat/reader.Message (#39873))
+	_ = manager.Init(&e.grp, v2.ModeRun)
 	c := conf.MustNewConfigFrom(config)
 	inp, err := manager.Create(c)
 	if err != nil {
@@ -110,11 +106,7 @@ func (e *inputTestingEnvironment) mustCreateInput(config map[string]interface{})
 func (e *inputTestingEnvironment) createInput(config map[string]interface{}) (v2.Input, error) {
 	e.grp = unison.TaskGroup{}
 	manager := e.getManager()
-<<<<<<< HEAD
-	manager.Init(&e.grp, v2.ModeRun)
-=======
-	_ = manager.Init(&e.grp)
->>>>>>> 535a17418d (libbeat: add Offset to libbeat/reader.Message (#39873))
+	_ = manager.Init(&e.grp, v2.ModeRun)
 	c := conf.MustNewConfigFrom(config)
 	inp, err := manager.Create(c)
 	if err != nil {