diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-10-01 01:25:41 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-10-01 01:25:41 +0200 |
| commit | 57b682d63e3a1e331aec58648e78731ec74714f4 (patch) | |
| tree | 4161f2265b4cd27e01f7ccfa85442bd8ea9fe2ea /coverity/build_Osmocom.sh | |
| parent | cb098683a69a0203ab58836be80da94705abf0cd (diff) | |
coverity: favor upstream for conflicts during pull
An upstream branch rebase caused a merge conflict on the build server
recently. This hopefully avoids that next time.
Change-Id: Ib9f48b3b2283d1b8d1a79d42732d935236a2b1c9
Diffstat (limited to 'coverity/build_Osmocom.sh')
0 files changed, 0 insertions, 0 deletions