Fix merge error

This commit is contained in:
Bart Sopers 2020-05-04 23:56:24 +02:00
parent 5e3e947d8e
commit ce435be382

View file

@ -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>