diff options
| author | Nicolas Lécureuil <neoclust@mageia.org> | 2017-08-09 00:02:05 +0200 |
|---|---|---|
| committer | Nicolas Lécureuil <neoclust@mageia.org> | 2017-08-09 00:02:05 +0200 |
| commit | bd1d39ee819304707982aa6b88c8abdd4dc0b9f8 (patch) | |
| tree | 4af625be1308ec48a543c0855934d8b70929f2d5 /sysconfig/network-scripts/network-functions | |
| parent | b53d95939e513b135b688548e8b587129ac683dd (diff) | |
| parent | 0e8fdd3b88156289b0020a5bcf85bdb2a8ab9744 (diff) | |
| download | initscripts-bd1d39ee819304707982aa6b88c8abdd4dc0b9f8.tar initscripts-bd1d39ee819304707982aa6b88c8abdd4dc0b9f8.tar.gz initscripts-bd1d39ee819304707982aa6b88c8abdd4dc0b9f8.tar.bz2 initscripts-bd1d39ee819304707982aa6b88c8abdd4dc0b9f8.tar.xz initscripts-bd1d39ee819304707982aa6b88c8abdd4dc0b9f8.zip | |
Try to fix conflicts
Diffstat (limited to 'sysconfig/network-scripts/network-functions')
| -rwxr-xr-x[-rw-r--r--] | sysconfig/network-scripts/network-functions | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 3c0205f0..3c0205f0 100644..100755 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions |