--- jsr166/src/jsr166e/ForkJoinPool.java	2012/11/19 18:12:28	1.18
+++ jsr166/src/jsr166e/ForkJoinPool.java	2012/11/20 06:18:39	1.20
@@ -103,12 +103,8 @@ import java.util.concurrent.TimeUnit;
  * java.util.concurrent.ForkJoinPool.common}: {@code parallelism} --
  * an integer greater than zero, {@code threadFactory} -- the class
  * name of a {@link ForkJoinWorkerThreadFactory}, and {@code
-<<<<<<< ForkJoinPool.java
- * exceptionHandler} -- the class name of a {@code
-=======
  * exceptionHandler} -- the class name of a {@link
  * java.lang.Thread.UncaughtExceptionHandler
->>>>>>> 1.111
  * Thread.UncaughtExceptionHandler}. Upon any error in establishing
  * these settings, default parameters are used.
  *
@@ -2480,7 +2476,7 @@ public class ForkJoinPool extends Abstra
             throw new IllegalArgumentException();
         this.factory = factory;
         this.ueh = handler;
-        this.config = parallelism | (asyncMode? (FIFO_QUEUE << 16) : 0);
+        this.config = parallelism | (asyncMode ? (FIFO_QUEUE << 16) : 0);
         long np = (long)(-parallelism); // offset ctl counts
         this.ctl = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
         int pn = nextPoolId();