fix egregious typo in default config

2023-09-26 17:12:56 +01:00
parent a8db56fa8c
commit 389823bf09
1 changed files with 0 additions and 8 deletions
--- a/share/config.yml
+++ b/share/config.yml
@@ -589,14 +589,6 @@ deferrable_actions:
  - 'macwalk'
  - 'arpwalk'
  - 'discoverall'
-<<<<<<< Updated upstream
-=======
-  - 'macwalk'
-  - 'nbtwalk'
-  - 'primeskiplist'
-  - 'scheduler'
-  - 'snapshot'
->>>>>>> Stashed changes

 # ---------------
 # GraphViz Export