From a05b04c0fdba89cc94ab7b187b674cea86c46db2 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 11 Jan 2015 20:00:54 +0100
Subject: [PATCH] dhcp/trivial: remove shaddowed '#if 0 /* NM_IGNORED */' block

Remove '#if 0' inside another '#if 0' block.
---
 src/dhcp-manager/systemd-dhcp/src/shared/util.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/util.c b/src/dhcp-manager/systemd-dhcp/src/shared/util.c
index 05d4eb757a..f3009df333 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/util.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/util.c
@@ -3342,7 +3342,6 @@ fail:
         return NULL;
 }
 
-#if 0 /* NM_IGNORED */
 char **replace_env_argv(char **argv, char **env) {
         char **ret, **i;
         unsigned k = 0, l = 0;
@@ -3407,7 +3406,6 @@ char **replace_env_argv(char **argv, char **env) {
         ret[k] = NULL;
         return ret;
 }
-#endif
 
 int fd_columns(int fd) {
         struct winsize ws = {};