diff options
| author | Kenny Root <kenny@the-b.org> | 2015-07-15 14:22:11 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-07-15 14:22:11 -0700 |
| commit | f688ba9d4c3d63e68267518f1d0773fcfb919085 (patch) | |
| tree | b2e93a3fa443f3596290e78afcbf119cedfd40fd /app/src/main/java/org/connectbot/service/ConnectionNotifier.java | |
| parent | 1535016c0ae92ee22189f4f0e0b9792659caa62f (diff) | |
| download | connectbot-f688ba9d4c3d63e68267518f1d0773fcfb919085.tar.gz connectbot-f688ba9d4c3d63e68267518f1d0773fcfb919085.tar.bz2 connectbot-f688ba9d4c3d63e68267518f1d0773fcfb919085.zip | |
fix merge error
Diffstat (limited to 'app/src/main/java/org/connectbot/service/ConnectionNotifier.java')
0 files changed, 0 insertions, 0 deletions