Fix merge conflicts

mpenning · Oct 10, 2023 · dfb1dbe · dfb1dbe
2 parents bc10659 + 7d8d3d8
commit dfb1dbe
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 24 deletions.
diff --git a/ciscoconfparse/ccp_abc.py b/ciscoconfparse/ccp_abc.py
@@ -29,7 +29,6 @@
 
 DEFAULT_TEXT = "__undefined__"
 
-
 #
 # -------------  Config Line ABC
 #
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,6 @@ @@
     DEFAULT_TEXT = "__undefined__"
     #
     # -------------  Config Line ABC
     #
@@ Expand Down @@