Skip to content

Commit 6ea0750

Browse files
committed
Merge branch 'release-2020.03.30' into develop
``` git mergetool This message is displayed because 'merge.tool' is not configured. See 'git mergetool --tool-help' or 'git help config' for more details. 'git mergetool' will now attempt to use one of the following tools: opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare smerge emerge vimdiff Merging: .travis.yml pythonforandroid/python.py testapps/setup_testapp_python3.py Normal merge conflict for '.travis.yml': {local}: modified file {remote}: modified file Hit return to start merge resolution tool (vimdiff): 4 files to edit Deleted merge conflict for 'pythonforandroid/python.py': {local}: deleted {remote}: modified file Use (m)odified or (d)eleted file, or (a)bort? d Deleted merge conflict for 'testapps/setup_testapp_python3.py': {local}: deleted {remote}: modified file Use (m)odified or (d)eleted file, or (a)bort? d ```
2 parents caf9f4b + c78a90d commit 6ea0750

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Diff for: pythonforandroid/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '2019.10.06.post0'
1+
__version__ = '2020.03.30'

0 commit comments

Comments
 (0)