Skip to content

Commit

Permalink
Merge pull request #48 from xianglin1998/master
Browse files Browse the repository at this point in the history
proxmark3.zip include.
  • Loading branch information
xianglin1998 authored Jul 1, 2020
2 parents 1e7b25c + 45cd1e9 commit 9a0eef2
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 3 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ captures/

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
*.zip

# Google Services (e.g. APIs or Firebase)
google-services.json
Expand Down
Binary file added app_main/src/main/assets/proxmark3.zip
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import android.app.Activity;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.system.ErrnoException;
import android.system.Os;

import com.termux.app.TermuxService;

Expand Down

0 comments on commit 9a0eef2

Please sign in to comment.