# HG changeset patch
# User henryjen
# Date 1384240578 28800
# Node ID c52d26fd783a6b10ff40c5f16c138dfa6cfcb260
# Parent  f0d3ac2474ee755b1180ec71bcdfa190845b17eb# Parent  9bf2e9c6bd558f05b724385fe2bb88f2d820f279
Merge

diff -r f0d3ac2474ee -r c52d26fd783a .jcheck/conf
--- a/.jcheck/conf	Thu Oct 31 16:47:09 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-project=jdk8