diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2023-10-04 14:16:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-04 14:16:20 +0300 |
| commit | 78f90360a106b89d263334a2b18f8c9fbd9c14dd (patch) | |
| tree | cc680fa7b8e2ade2cdd773f208bea3c26eb34f55 | |
| parent | 6305464645c70dc98533efce4d85194620e6a575 (diff) | |
| download | vyos-user-utils-78f90360a106b89d263334a2b18f8c9fbd9c14dd.tar.gz vyos-user-utils-78f90360a106b89d263334a2b18f8c9fbd9c14dd.zip | |
T5632: Fix conflicts after backport jq
Mergify tried to backport #7 to equuleus but there were some conflicts
| -rw-r--r-- | debian/control | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/debian/control b/debian/control index 4640e15..2bdb441 100644 --- a/debian/control +++ b/debian/control @@ -18,11 +18,8 @@ Depends: iftop, iotop, irqtop, -<<<<<<< HEAD ipcalc, -======= jq, ->>>>>>> eb27212 (T5632: Add user-util jq to parse JSON files from sh) libnss-myhostname, lsof, localepurge, |