laforge submitted this change.
scripts: wireshark: remove laforge/doc-fixes
The two patches from this branch have been upstreamed:
https://gitlab.com/wireshark/wireshark/-/commit/15ed53005b7b924303514e2d3618c29584772f27
And with recent changes to docs/README.dissector, git fails to detect
that these are already applied.
Fix for:
CONFLICT (content): Merge conflict in doc/README.dissector
Change-Id: I17017ba396996e781250d30406193c4f5ec44f82
---
M scripts/obs/update_obs_wireshark.sh
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/scripts/obs/update_obs_wireshark.sh b/scripts/obs/update_obs_wireshark.sh
index ae66aaa..e422292 100755
--- a/scripts/obs/update_obs_wireshark.sh
+++ b/scripts/obs/update_obs_wireshark.sh
@@ -4,7 +4,6 @@
BRANCHES="
osmith/deb-packaging
- laforge/doc-fixes
osmocom/qcdiag
laforge/rspro
"
To view, visit change 34402. To unsubscribe, or for help writing mail filters, visit settings.