Christian Schabesberger c43ac7c869 fix conflict

2018-05-27 13:30:23 +02:00

..

org/schabi/newpipe

fix conflict

2018-05-27 13:30:23 +02:00

us/shandian/giga/get

Use correct long comparison (fixes #726)

2017-09-23 08:35:06 -03:00