Projects >> jogl >>6da90f18da639f942bce9dec7fdd9a6c43e22145

Chunk
Conflicting content 
    protected void reconfigureWindowImpl(int x, int y, int width, int height) {
        reconfigureWindow0(fullscreen?0:getParentWindowHandle(), getDisplayHandle(), getScreenIndex(), getWindowHandle(),
<<<<<<< HEAD
                            x, y, width, height, isUndecorated(), isVisible());
=======
                            x, y, width, height, isUndecorated(fullscreen), isVisible(),isFullscreen());
>>>>>>> 65a2eecc69772c3bfd3dda5407a31baf11437a2b
    }

    protected boolean reparentWindowImpl() {
Solution content 
    protected void reconfigureWindowImpl(int x, int y, int width, int height) {
        reconfigureWindow0(fullscreen?0:getParentWindowHandle(), getDisplayHandle(), getScreenIndex(), getWindowHandle(),
                           x, y, width, height, isUndecorated(), isVisible(), isFullscreen());
    }

    protected boolean reparentWindowImpl() {
File
X11Window.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable