Projects >> android-emulator-plugin >>e5e8ec922942093e27d7c1e23c50eaefa11eef95

Chunk
Conflicting content 
        return new File(getAvdHome(homeDir), getAvdName() +".avd");
    }

<<<<<<< HEAD
    private File getAvdMetadataFile(final File homeDir) {
=======
    public File getAvdMetadataFile(boolean isUnix) {
        final File homeDir = getHomeDirectory(isUnix);
>>>>>>> 05ca6d05439a157a89d892e0e00226291e2c3cb5
        return new File(getAvdHome(homeDir), getAvdName() +".ini");
    }
Solution content 
        return new File(getAvdHome(homeDir), getAvdName() +".avd");
    }

    public File getAvdMetadataFile(boolean isUnix) {
        final File homeDir = getHomeDirectory(isUnix);
        return new File(getAvdHome(homeDir), getAvdName() +".ini");
    }
File
EmulatorConfig.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
<<<<<<< HEAD
import java.io.PrintStream;
import java.io.PrintWriter;
import java.net.Socket;
import java.net.SocketException;
=======
import java.util.ArrayList;
import java.util.Arrays;
>>>>>>> 05ca6d05439a157a89d892e0e00226291e2c3cb5
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Solution content 
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.net.Socket;
import java.net.SocketException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
File
Utils.java
Developer's decision
Concatenation
Kind of conflict
Import