Update docs/configuration/vrf/index.rst

added suggestion from dmbaturin Co-authored-by: Daniil Baturin <[email protected]> (cherry picked from commit d70a4e2) # Conflicts: # docs/configuration/vrf/index.rst
vyos · Sep 6, 2024 · f6b67a6 · f6b67a6
1 parent 776e2bb
commit f6b67a6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/docs/configuration/vrf/index.rst b/docs/configuration/vrf/index.rst
@@ -20,10 +20,14 @@ then enslaved to a VRF device.
 
 .. cfgcmd:: set vrf name <name> table <id>
 
+<<<<<<< HEAD
 <<<<<<< HEAD
    Configured routing table `<id>` is used by VRF `<name>`.
 =======
    Create new VRF instance with `<name>` and <id>. The name is used when placing
+=======
+   Create a new VRF instance with `<name>` and <id>. The name is used when placing
+>>>>>>> d70a4e22 (Update docs/configuration/vrf/index.rst)
    individual interfaces into the VRF.
 >>>>>>> 63fb97b2 (Update doc config vrf)