diff options
| author | Franklin Wei <git@fwei.tk> | 2018-07-29 12:23:28 -0400 |
|---|---|---|
| committer | Franklin Wei <git@fwei.tk> | 2018-07-29 12:23:28 -0400 |
| commit | 210881ca35df0f05a11c2cf88cd73ddab18cff1d (patch) | |
| tree | 1aada120ac10545e7fde4cab15fc97df104a4623 /firmware/usbstack | |
| parent | e9bdb4b0281ad9b4a58526f212f1cbbecb49e91a (diff) | |
| download | rockbox-210881ca35df0f05a11c2cf88cd73ddab18cff1d.tar.gz rockbox-210881ca35df0f05a11c2cf88cd73ddab18cff1d.zip | |
Remove leftover merge conflict marker
Change-Id: Ie34657fe652d3613429d3fa233faac9608a8b826
Diffstat (limited to 'firmware/usbstack')
0 files changed, 0 insertions, 0 deletions