# HG changeset patch
# User tbell
# Date 1534807136 25200
# Node ID d222f503b7fe8aea00efce94fc62254d3d905e63
# Parent  e4ba2cfcfa92778b1eb71ec1fafe8388b63a4694
8209760: merge error: restore ea in make/conf/jib-profiles.js
Reviewed-by: mikael

diff -r e4ba2cfcfa92 -r d222f503b7fe make/conf/jib-profiles.js
--- a/make/conf/jib-profiles.js	Mon Aug 20 15:37:47 2018 -0700
+++ b/make/conf/jib-profiles.js	Mon Aug 20 16:18:56 2018 -0700
@@ -1171,7 +1171,7 @@
         args = concat(args,
                       // This needs to be changed when we start building release candidates
                       // with-version-pre must be set to ea for 'ea' and empty for fcs build
-                      "--with-version-pre=",
+                      "--with-version-pre=ea",
                       "--without-version-opt");
     } else {
         args = concat(args, "--with-version-opt=" + common.build_id);