Projects >> android-frameworks-base >>4c2fc8cb2571061371a34e736f157686ba57a779

Chunk
Conflicting content
package android.opengl;

<<<<<<< HEAD
/** OpenGL ES 2.0
=======
/** OpenGL ES 2.0. This class exposes the core OpenGL ES 2.0 APIs.
 * All the methods are static.
>>>>>>> fac576360f7b2cd06e6b174894e8d192088349b0
 */
public class GLES20 {
    public static final int GL_ACTIVE_TEXTURE                          = 0x84E0;
Solution content
package android.opengl;

/** OpenGL ES 2.0. This class exposes the core OpenGL ES 2.0 APIs.
 * All the methods are static.
 */
public class GLES20 {
    public static final int GL_ACTIVE_TEXTURE                          = 0x84E0;
File
GLES20.java
Developer's decision
Version 2
Kind of conflict
Comment