diff options
| author | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
|---|---|---|
| committer | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
| commit | 9297468fa579836e3a6a381b798feb6b78217c2d (patch) | |
| tree | 53168212f427afbcf0693b534530a4af803152e9 /user/networkmanager/tests.patch | |
| parent | a63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff) | |
| parent | da5a69b65a8791fffa6e93366ee585f87eff136d (diff) | |
| download | packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2 packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip | |
Merge branch 'master' into zfs
Diffstat (limited to 'user/networkmanager/tests.patch')
| -rw-r--r-- | user/networkmanager/tests.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user/networkmanager/tests.patch b/user/networkmanager/tests.patch index ec9719a89..d2691db3b 100644 --- a/user/networkmanager/tests.patch +++ b/user/networkmanager/tests.patch @@ -1,6 +1,6 @@ --- NetworkManager-1.18.1/src/devices/tests/test-lldp.c.old 2019-04-18 09:19:11.000000000 +0000 +++ NetworkManager-1.18.1/src/devices/tests/test-lldp.c 2019-05-10 07:23:58.979198831 +0000 -@@ -20,7 +20,6 @@ +@@ -6,7 +6,6 @@ #include "nm-default.h" #include <fcntl.h> @@ -8,7 +8,7 @@ #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/types.h> -@@ -31,6 +30,7 @@ +@@ -17,6 +16,7 @@ #include "platform/tests/test-common.h" #include "nm-test-utils-core.h" |