Skip to content

Commit 5104bb3

Browse files
committed
Merge branch 'hotfix/remove_constraint_layout'
2 parents c88a08f + e3756a7 commit 5104bb3

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ dependencies {
2323
compile project(path: ':library')
2424
compile fileTree(dir: 'libs', include: ['*.jar'])
2525
compile 'com.android.support:appcompat-v7:23.4.0'
26-
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha3'
2726
testCompile 'junit:junit:4.12'
2827
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
2928
androidTestCompile 'com.android.support.test:runner:0.5'

app/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout
2+
<LinearLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:id="@+id/activity_main"
@@ -12,4 +12,4 @@
1212
android:layout_width="match_parent"
1313
android:layout_height="match_parent"/>
1414

15-
</android.support.constraint.ConstraintLayout>
15+
</LinearLayout>

0 commit comments

Comments
 (0)