Skip to content

Commit

Permalink
Fix conflict manifest
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesnguyenhub committed Jun 12, 2017
1 parent 2de5e67 commit 8a4b8f2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Gradle

```javascript
dependencies {
compile 'com.tuyenmonkey:mkloader:1.2.0'
compile 'com.tuyenmonkey:mkloader:1.3.0'
}
```
Snapshots of the development version are available in [Sonatype's `snapshots` repository](https://oss.sonatype.org/content/repositories/snapshots/).
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
org.gradle.parallel=true

VERSION_NAME=1.3.0-SNAPSHOT
VERSION_NAME=1.3.0
VERSION_CODE=3
GROUP=com.tuyenmonkey

Expand Down
12 changes: 1 addition & 11 deletions library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tuyenmonkey.mkloader">

<application android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true"
>

</application>

</manifest>
<manifest package="com.tuyenmonkey.mkloader"/>

0 comments on commit 8a4b8f2

Please sign in to comment.