63865fefec
# Conflicts: # app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
# Conflicts: # app/src/main/java/org/mian/gitnex/activities/LoginActivity.java