Projects >> JavaMessanger >>60132373f989afca0cf20ded270b1fdb246c1e12

Chunk
Conflicting content
        loggedUser = false;
    }

<<<<<<< HEAD
    public String getMyPublicIP() {
        System.out.println("getMyPublicIP()");
        try {
            URL readIp = new URL("http://automation.whatismyip.com/n                                                             09230945.asp");
            BufferedReader in = new BufferedReader(new InputStreamReader(readIp.openStream()));
            String ip_address = (in.readLine()).trim();

            return ip_address;

        } catch (Exception e) {
            e.printStackTrace();

            return "Blad odczytu";
        }
    }

=======
>>>>>>> 4aa0ae4c038837e4bbe0e8893a1265eaf72e99dc
    public boolean selectAuthentication(String userName, String password) {
        System.out.println("selectAuthentication()");
        boolean islooged = false;
Solution content
        loggedUser = false;
    }

    public boolean selectAuthentication(String userName, String password) {
        System.out.println("selectAuthentication()");
        boolean islooged = false;
File
LoginController.java
Developer's decision
Version 2
Kind of conflict
Method declaration