Hi,
When I build the Grizzly 2.0, I meet the following error.
============
[INFO]
------------------------------------------------------------------------
[INFO] Building grizzly-config 2.0.1-SNAPSHOT
[INFO]
------------------------------------------------------------------------
[INFO]
[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @
grizzly-config ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 0 resource
[INFO] Copying 1 resource
[INFO]
[INFO] --- hk2-maven-plugin:1.0.72:hk2-compile (default-hk2-compile) @
grizzly-config ---
[INFO] Compiling 42 source files to
D:\grizzly20\code\modules\config\target\classes
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:398: illegal start of expression
<<<<<<< HEAD
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:398: illegal start of expression
<<<<<<< HEAD
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:398: illegal start of expression
<<<<<<< HEAD
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:398: > expected
<<<<<<< HEAD
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:399: illegal start of expression
}
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:400: illegal start of expression
=======
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:400: illegal start of expression
=======
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:400: illegal start of expression
=======
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:401: illegal start of expression
}
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:402: illegal start of expression
>>>>>>> 849532f3f1a942a1a22e23094887b6a4252bfc60
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:402: illegal start of expression
>>>>>>> 849532f3f1a942a1a22e23094887b6a4252bfc60
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:402: ';' expected
>>>>>>> 849532f3f1a942a1a22e23094887b6a4252bfc60
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:402: not a statement
>>>>>>> 849532f3f1a942a1a22e23094887b6a4252bfc60
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:402: ';' expected
>>>>>>> 849532f3f1a942a1a22e23094887b6a4252bfc60
^
D:\grizzly20\code\modules\config\src\main\java\org\glassfish\grizzly\config\
GenericGrizzly
Listener.java:405: illegal start of expression
protected void configureThreadPool(final Habitat habitat,
^
Š
============
It seems that a wrong code was committed in rev.6232.
Thanks!
Regards,
Bongjae Chang