Fix merge error
This commit is contained in:
parent
5e3e947d8e
commit
ce435be382
1 changed files with 0 additions and 4 deletions
|
@ -310,10 +310,6 @@
|
||||||
<activity android:name="com.atech.android.library.wizardpager.WizardPagerActivity"
|
<activity android:name="com.atech.android.library.wizardpager.WizardPagerActivity"
|
||||||
android:theme="@style/AppTheme.NoActionBar"/>
|
android:theme="@style/AppTheme.NoActionBar"/>
|
||||||
|
|
||||||
<uses-library
|
|
||||||
android:name="org.apache.http.legacy"
|
|
||||||
android:required="false" />
|
|
||||||
|
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
Loading…
Reference in a new issue