Mercurial > public > ostc4
comparison Discovery/Src/data_exchange_main.c @ 352:1f24022345d1 fix-merge-mess
Fix merge problem
The merge in changeset 352 is simply wrong, so revert all changes
made in that merge.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| author | Jan Mulder <jlmulder@xs4all.nl> |
|---|---|
| date | Tue, 08 Oct 2019 16:35:45 +0200 |
| parents | ea3fda8eb93e |
| children | 439874690f85 |
comparison
equal
deleted
inserted
replaced
| 351:ba53ab77f059 | 352:1f24022345d1 |
|---|