t

app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
@@ -546,4 +544,3 @@ public class IssueDetailActivity extends AppCompatActivity {
     }
 
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/activities/MainActivity.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.activities;
 
 import android.content.ActivityNotFoundException;
@@ -414,4 +412,3 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     }
 
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
@@ -145,4 +143,3 @@ public class AdminGetUsersAdapter extends RecyclerView.Adapter<AdminGetUsersAdap
     };
 
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
@@ -91,4 +89,3 @@ public class CollaboratorsAdapter extends BaseAdapter  {
     }
 
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
@@ -290,4 +288,3 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
     }
 
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
@@ -133,4 +131,3 @@ public class MembersByOrgAdapter extends BaseAdapter implements Filterable {
     };
 
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
@@ -239,4 +237,3 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
         }
     };
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import androidx.annotation.NonNull;
@@ -132,4 +130,3 @@ public class OrganizationsListAdapter extends RecyclerView.Adapter<Organizations
     };
 
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
@@ -78,4 +76,3 @@ public class ProfileFollowersAdapter extends RecyclerView.Adapter<ProfileFollowe
 }
 
 
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
@@ -77,4 +75,3 @@ public class ProfileFollowingAdapter extends RecyclerView.Adapter<ProfileFollowi
 
 
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
@@ -242,4 +240,3 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
     };
 
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
@@ -241,4 +239,3 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
     };
 
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
@@ -241,4 +239,3 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
     };
 
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import android.annotation.SuppressLint;
@@ -91,4 +89,3 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
 
     }
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.adapters;
 
 import android.content.Context;
@@ -207,4 +205,3 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
         return usersSearchList.size();
     }
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.fragments;
 
 import android.content.Context;
@@ -146,4 +144,3 @@ public class OrganizationInfoFragment extends Fragment {
         void onFragmentInteraction(Uri uri);
     }
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 package org.mian.gitnex.fragments;
 
 import android.content.Context;
@@ -125,4 +123,3 @@ public class ProfileFragment extends Fragment {
     }
 
 }
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

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

@@ -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>
+</LinearLayout>
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

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

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

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

@@ -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>
+</LinearLayout>
->>>>>>> 85140fbee0ff8626da3430c14233d3ecd7f34871

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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