Projects information

Chunk

Conflicting content
public static Camera4672014 getInstance() { if (instance == null) { instance = new Camera4672014(); <<<<<<< HEAD //new Thread(instance).start(); ======= new Thread(instance).start(); >>>>>>> 70310bfe57388cbb77c91cd4c819cdc5f6af4efb } return instance; }

Conflicting content

    public static Camera4672014 getInstance() {
        if (instance == null) {
            instance = new Camera4672014();
<<<<<<< HEAD
            //new Thread(instance).start();
=======
            new Thread(instance).start();
>>>>>>> 70310bfe57388cbb77c91cd4c819cdc5f6af4efb
        }
        return instance;
    }

Solution content
public static Camera4672014 getInstance() { if (instance == null) { instance = new Camera4672014(); //new Thread(instance).start(); } return instance; }

File
Camera4672014.java

Developer's decision
Version 1

Kind of conflict
Comment
Method invocation

Projects >> Team467-FRC-Robot-Code >>d3ffcfc8dae044778d9a016878df8b04f9fb8ef8