cleanup debris from revert

Last revert didn't come out clean.

diff --git a/ip/iplink_macvlan.c b/ip/iplink_macvlan.c
index 41325451988d5fdfe8b7404f0a6f870e4fc025d7..83ff961b1892e7c335c291a178ea0701a9fe6d49 100644 (file)
--- a/ip/iplink_macvlan.c
+++ b/ip/iplink_macvlan.c
@@ -39,16 +39,8 @@ static void explain(struct link_util *lu)
        print_explain(lu, stderr);
 }
 
-static int mode_arg(const char *arg)
-{
-<<<<<<< HEAD
-       fprintf(stderr,
-               "Error: argument of \"mode\" must be \"private\", \"vepa\", \"bridge\", \"passthru\" or \"source\", not \"%s\"\n",
-               arg);
-       return -1;
-}
 
-static int flag_arg(const char *arg)
+static int mode_arg(const char *arg)
 {
        fprintf(stderr,
                "Error: argument of \"mode\" must be \"private\", \"vepa\", \"bridge\" or \"passthru\", not \"%s\"\n",