Hi Szymon, On Wed, Oct 30, 2013, Szymon Janc wrote: > This file cotains help on how BlueZ for Android should be build, run > and test. Some hints and examples on how BlueZ can be intergrated into > Android are present as well. > --- > v4: > - workarounded issue with leftover conflicting markers > > for the record: it appears that double appearance of lines with > ======= > (7 equality marks) confuses git that there is unresolved conflict. > > android/Makefile.am | 2 +- > android/README | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 91 insertions(+), 1 deletion(-) > create mode 100644 android/README Applied. Thanks. Johan -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
