Skip to content

Commit 523e517

Browse files
author
Your Name
committed
env: remove merge marker from .env.example
1 parent a778d66 commit 523e517

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

‎.env.example‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ PCAP_OVER_IP=
4545
#PCAP_OVER_IP="host.docker.internal:1337"
4646
# For multiple PCAP_OVER_IP you can comma separate
4747
#PCAP_OVER_IP="host.docker.internal:1337,otherhost.com:5050"
48-
<<<<<<< HEAD
4948

5049
##############################
5150
# DUMP_PCAPS CONFIGS

0 commit comments

Comments
 (0)