Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/src/main/java/com/performancetweaker/app/ui/MainActivity.java
#	app/src/main/java/com/performancetweaker/app/utils/Constants.java
#	app/src/main/res/layout/fragment_main_layout_navbar.xml
  • Loading branch information
rahulkumar66 committed Apr 4, 2020
2 parents a24319c + bf3465c commit f18d5bc
Showing 1 changed file with 0 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
import android.view.MenuItem;
import android.view.View;
import android.widget.LinearLayout;
Expand Down

0 comments on commit f18d5bc

Please sign in to comment.