github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-18 22:52:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

A git conflict slipped into the repo, fixing

Browse Source
This commit is contained in:
Joe Bowser 2017-11-29 11:38:14 -08:00
parent fae39dd2e5
commit c0c3b769f2
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
framework/build.gradle
View File

@ -129,15 +129,9 @@ bintray {
licenses = ['Apache-2.0'] licenses = ['Apache-2.0']
labels = ['android', 'cordova', 'phonegap'] labels = ['android', 'cordova', 'phonegap']
version { version {
<<<<<<< HEAD name = '6.4.1-dev'
name = '6.4.0'
released = new Date() released = new Date()
vcsTag = '6.4.0' vcsTag = '6.4.1-dev'
=======
name = '6.5.0-dev'
released = new Date()
vcsTag = '6.5.0-dev'
>>>>>>> master
} }
} }
} }