aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/test/java
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-09-11 17:37:01 -0700
committerKenny Root <kenny@the-b.org>2015-09-11 17:37:01 -0700
commit705b3461cfa26f074464a32a2642741691340c1f (patch)
tree052fe430778bdd031706bf4aefdabfa4f9bad451 /app/src/test/java
parent85043c9219de3b9d69557b4de61b4a85a19f234a (diff)
downloadconnectbot-705b3461cfa26f074464a32a2642741691340c1f.tar.gz
connectbot-705b3461cfa26f074464a32a2642741691340c1f.tar.bz2
connectbot-705b3461cfa26f074464a32a2642741691340c1f.zip
Fix merge error in PubkeyListActivity
Diffstat (limited to 'app/src/test/java')
0 files changed, 0 insertions, 0 deletions