Fixed merge conflicts
This commit is contained in:
parent
eb1d5d5c99
commit
ded647e2be
|
@ -39,7 +39,7 @@
|
||||||
<activity android:theme="@android:style/Theme.Translucent.NoTitleBar" android:name=".modules.Messages" android:label="@string/messagesModuleLabel" android:configChanges="keyboard|keyboardHidden|orientation"></activity>
|
<activity android:theme="@android:style/Theme.Translucent.NoTitleBar" android:name=".modules.Messages" android:label="@string/messagesModuleLabel" android:configChanges="keyboard|keyboardHidden|orientation"></activity>
|
||||||
<activity android:name=".modules.notifications.NotificationItem" android:theme="@android:style/Theme.NoTitleBar" android:label="@string/notificationsModuleLabel"></activity>
|
<activity android:name=".modules.notifications.NotificationItem" android:theme="@android:style/Theme.NoTitleBar" android:label="@string/notificationsModuleLabel"></activity>
|
||||||
<activity android:theme="@android:style/Theme.Translucent.NoTitleBar" android:name=".modules.Notices" android:label="@string/noticesModuleLabel" android:configChanges="keyboard|keyboardHidden|orientation"></activity>
|
<activity android:theme="@android:style/Theme.Translucent.NoTitleBar" android:name=".modules.Notices" android:label="@string/noticesModuleLabel" android:configChanges="keyboard|keyboardHidden|orientation"></activity>
|
||||||
</application>
|
|
||||||
|
|
||||||
<provider android:name=".sync.DummyProvider"
|
<provider android:name=".sync.DummyProvider"
|
||||||
android:authorities="es.ugr.swad.content"
|
android:authorities="es.ugr.swad.content"
|
||||||
|
|
|
@ -27,7 +27,7 @@ public class Global {
|
||||||
/**
|
/**
|
||||||
* SWAD application key
|
* SWAD application key
|
||||||
*/
|
*/
|
||||||
private static final String AppKey = "HTC-Desire";
|
private static final String AppKey = "";
|
||||||
/**
|
/**
|
||||||
* User logged flag
|
* User logged flag
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue
Block a user