import java.net.URLEncoder;
import java.util.ArrayList;

<<<<<<< HEAD:OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
public class KeybaseKeyserver extends Keyserver {
=======
public class KeybaseKeyServer extends KeyServer {
    private String mQuery;
>>>>>>> 1386282840128529f54572b6dee216cf5c5cf044:OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyServer.java

    @Override
    public ArrayList search(String query) throws QueryException, TooManyResponses,

import java.net.URLEncoder;
import java.util.ArrayList;

public class KeybaseKeyserver extends Keyserver {
    private String mQuery;

    @Override
    public ArrayList search(String query) throws QueryException, TooManyResponses,