sdf

bigpod98 · bigpod98 · commit d4e1fdbf3aa1 · 2025-12-29T06:06:37.000Z
diff --git a/.gitignore b/.gitignore
@@ -30,10 +30,6 @@ go.work.sum
 # Editor/IDE
 # .idea/
 # .vscode/
-<<<<<<< HEAD
 out/
 dragonctl
 main
-=======
-out/*
->>>>>>> 4b835b4e7448835b90f4cc93aabc53468fc6bf53
