removed extra line

Seagate · Jul 3, 2024 · f0eeba3 · f0eeba3
1 parent 7f1f846
commit f0eeba3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/component/libfuse/libfuse2_handler.go b/component/libfuse/libfuse2_handler.go
@@ -183,10 +183,6 @@ func (lf *Libfuse) initFuse() error {
 			} else {
 				kindStorage = "container"
 			}
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes
 		}
 
 		volumePrefix := fmt.Sprintf("--VolumePrefix=\\%s\\%s", kindStorage, nameStorage)