osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34402?usp=email ) Change subject: scripts: wireshark: remove laforge/doc-fixes ...................................................................... scripts: wireshark: remove laforge/doc-fixes The two patches from this branch have been upstreamed: https://gitlab.com/wireshark/wireshark/-/commit/15ed53005b7b924303514e2d361… 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/02/34402/1 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 https://gerrit.osmocom.org/c/osmo-ci/+/34402?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I17017ba396996e781250d30406193c4f5ec44f82 Gerrit-Change-Number: 34402 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange