Fix merge wart

saltstack · Nov 23, 2024 · ad0ee11 · ad0ee11
1 parent 9f44336
commit ad0ee11
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/custom/testing/systemd-amazonlinux-2023.Dockerfile b/custom/testing/systemd-amazonlinux-2023.Dockerfile
@@ -22,18 +22,11 @@ RUN <<EOF
 
 #  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply python
 
-<<<<<<< Updated upstream
-  rm -rf salt
-  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
-  rm -rf golden-pillar-tree
-  rm -rf golden-state-tree
-  rm -rf /tmp/*
-=======
 #  rm -rf salt
 #  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
 #  rm -rf golden-pillar-tree
 #  rm -rf golden-state-tree
->>>>>>> Stashed changes
+#  rm -rf /tmp/*
 
   mv /usr/bin/tail /usr/bin/tail.real
 EOF