Projects >> logback-gelf >>40420c5a1f8d4d38773c799072687fe80af4988e

Chunk
Conflicting content
import java.net.UnknownHostException;

public class InternetUtils {
<<<<<<< HEAD:src/main/java/me/moocar/logbackgelf/InternetUtils.java
=======
    private static final String REGEX_IP_ADDRESS = "\\d+(\\.\\d+){3}";

    private InternetUtils() {
    }
>>>>>>> 7112b42300444fdab4a751b6ab30c53d13dc2686:src/main/java/me/moocar/logbackgelf/util/InternetUtils.java

    /**
     * Retrieves the local host's hostname. If found, the fully qualified domain name (FQDN) will be returned,
Solution content
import java.net.UnknownHostException;

public class InternetUtils {
    private static final String REGEX_IP_ADDRESS = "\\d+(\\.\\d+){3}";

    private InternetUtils() {
    }

    /**
     * Retrieves the local host's hostname. If found, the fully qualified domain name (FQDN) will be returned,
File
InternetUtils.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method declaration