Projects >> AbFab3D >>b226838ff5bc611f913487cc27d401b00db14ab9

Chunk
Conflicting content 
    // symmetry to be used 
    protected Symmetry m_sym;

<<<<<<< HEAD
    /**
       default cponstructor with default symmetry type WP_S2222;
     */
    public WallpaperSymmetry(){
        setSymmetryType(WP_S2222);
=======
    public WallpaperSymmetry() {

>>>>>>> 6c6757929e2d9a02378ec9c3da73c6d7dad7bf11
    }

    public WallpaperSymmetry(int symmetryType){
Solution content 
    // symmetry to be used 
    protected Symmetry m_sym;

    /**
       default cponstructor with default symmetry type WP_S2222;
     */
    public WallpaperSymmetry(){
        setSymmetryType(WP_S2222);
    }

    public WallpaperSymmetry(int symmetryType){
File
WallpaperSymmetry.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Method signature