fix: .gitignore

daeuniverse · Oct 29, 2024 · 2b3ac19 · 2b3ac19
1 parent 840d97d
commit 2b3ac19
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,15 +2,10 @@
 .idea
 *.o
 *.tmp
-<<<<<<< HEAD
 bpf_bpfeb*.go
 bpf_bpfel*.go
 bpf_*_bpfeb*.go
 bpf_*_bpfel*.go
-=======
-bpf*_bpfeb*.go
-bpf*_bpfel*.go
->>>>>>> 8d3cfca (refactor/optimize: rework route with bpf_loop)
 dae
 outline.json
 go-mod/