shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

t

Browse Source
This commit is contained in:
M M Arif
2019-10-01 10:23:50 +05:00
parent 5c6d5177fb
commit c05e69cfe9
29 changed files with 2 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/layout/activity_issue_detail.xml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -206,5 +204,4 @@
</RelativeLayout>
</LinearLayout>
>>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871
</LinearLayout>

3
app/src/main/res/layout/admin_users_list.xml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
@@ -76,4 +74,3 @@
</LinearLayout>
</RelativeLayout>
>>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

5
app/src/main/res/layout/fragment_profile.xml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
@@ -114,5 +112,4 @@
android:layout_height="wrap_content"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</LinearLayout>
>>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871
</LinearLayout>

3
app/src/main/res/layout/issue_comments.xml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -108,4 +106,3 @@
</RelativeLayout>
>>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

3
app/src/main/res/layout/my_repos_list.xml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -145,4 +143,3 @@
</RelativeLayout>
</RelativeLayout>
>>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

3
app/src/main/res/layout/nav_header.xml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
@@ -72,4 +70,3 @@
</LinearLayout>
>>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

3
app/src/main/res/layout/organizations_list.xml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -60,4 +58,3 @@
</RelativeLayout>
</RelativeLayout>
>>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

3
app/src/main/res/layout/profile_followers_list.xml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -48,4 +46,3 @@
</LinearLayout>
</RelativeLayout>
>>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

3
app/src/main/res/layout/profile_following_list.xml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -48,4 +46,3 @@
</LinearLayout>
</RelativeLayout>
>>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

3
app/src/main/res/layout/repos_list.xml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -145,4 +143,3 @@
</RelativeLayout>
</RelativeLayout>
>>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

3
app/src/main/res/layout/repositories_by_org_list.xml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -145,4 +143,3 @@
</RelativeLayout>
</RelativeLayout>
>>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

3
app/src/main/res/layout/starred_repos_list.xml
View File

@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -145,4 +143,3 @@
</RelativeLayout>
</RelativeLayout>
>>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871