resolved the conflict by changing the filename to 0007

vharish02 · Sep 13, 2019 · 021d60b · 021d60b
1 parent 2ad2a4b
commit 021d60b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/...3+dfsg/0006-Linux-VRF-5.7.3-Support.patch → ...3+dfsg/0007-Linux-VRF-5.7.3-Support.patch b/...3+dfsg/0006-Linux-VRF-5.7.3-Support.patch → ...3+dfsg/0007-Linux-VRF-5.7.3-Support.patch
diff --git a/src/snmpd/patch-5.7.3+dfsg/series b/src/snmpd/patch-5.7.3+dfsg/series
@@ -3,4 +3,4 @@
 0003-CHANGES-BUG-2743-snmpd-crashes-when-receiving-a-GetN.patch
 0004-Disable-SNMPv1.patch
 0005-Port-OpenSSL-1.1.0-with-support-for-1.0.2.patch
-0006-Linux-VRF-5.7.3-Support.patch
+0007-Linux-VRF-5.7.3-Support.patch