fix merge conflict

This commit is contained in:
Akinwale Ariwodola 2019-10-15 10:29:43 +01:00
commit fecbc977a5
2 changed files with 2 additions and 2 deletions

View file

@ -32,7 +32,7 @@ sudo -H pip install --upgrade cython==0.28.1 setuptools
```
### Step 3 of 10
Install buildozer, a tool for creating the apk package using the python for android toolcahin.
Install buildozer, a tool for creating the apk package using the python for android toolchain.
```
git clone https://github.com/lbryio/buildozer.git
cd buildozer && python2.7 setup.py install && cd ..

2
app

@ -1 +1 @@
Subproject commit 194e29356f24527f7d17c6adbaf24c0165b54a67
Subproject commit 60b0667546d3d6187fb5bf35456c67c1280f225d