Projects >> thucydides >>e8d33a3788c40172d3a95af23e4198c66e50ed88

Chunk
Conflicting content
    TEST_ROOT_PACKAGE("thucydides.test.root"),

    /**
<<<<<<< HEAD
     * The directory Thucydides will use to find CSV files for data-driven tests, if the $DATADIR variable is used.
     */
    DATA_DIRECTORY("thucydides.data.dir");
=======
     * The hierarchy of capability types.
     * This is the list of capability types to be used when reading capabilities from the file system
     * and when organizing the reports. It is a comma-separated list of tags.The default value is: capability, feature
     */
    CAPABILITY_TYPES("thucydides.capability.types");
>>>>>>> c0792bef3c8c0eabb6fc7bc621647c9ff1278fff

    private String propertyName;
    public static final int DEFAULT_HEIGHT = 700;
Solution content
    TEST_ROOT_PACKAGE("thucydides.test.root"),

  /**
     * The hierarchy of capability types.
     * This is the list of capability types to be used when reading capabilities from the file system
     * and when organizing the reports. It is a comma-separated list of tags.The default value is: capability, feature
     */
    CAPABILITY_TYPES("thucydides.capability.types"),

    /**
     * The hierarchy of capability types.
     * This is the list of capability types to be used when reading capabilities from the file system
     * and when organizing the reports. It is a comma-separated list of tags.The default value is: capability, feature
     */
    DATA_DIRECTORY("thucydides.data.dir");


    private String propertyName;
    public static final int DEFAULT_HEIGHT = 700;
File
ThucydidesSystemProperty.java
Developer's decision
Manual
Kind of conflict
Comment
Enum value