From 915fd68aca51806f4811b11561750252b2f282db Mon Sep 17 00:00:00 2001
From: CyC2018 <1029579233@qq.com>
Date: Mon, 19 Mar 2018 11:50:35 +0800
Subject: [PATCH] auto commit

---
 notes/Java 并发.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/notes/Java 并发.md b/notes/Java 并发.md
index 90aa859d..b7d7cd00 100644
--- a/notes/Java 并发.md	
+++ b/notes/Java 并发.md	
@@ -93,11 +93,7 @@ public class MyCallable implements Callable<Integer> {
     public Integer call() {
         // ...
     }
-<<<<<<< HEAD
     public static void main(String[]  args) {
-=======
-    public static void main(String[] args) {
->>>>>>> 2faeffa23889c3e88b59ddf56845d2cf3db83f76
         MyCallable mc = new MyCallable();
         FutureTask<Integer> ft = new FutureTask<>(mc);
         Thread thread = new Thread(ft);
@@ -423,7 +419,7 @@ interrupted() 方法在检查完中断状态之后会清除中断状态，这样
 - 没有设置 Timeout 参数的 Thread.join() 方法
 - LockSupport.park() 方法
 
-以下方法会让线程进入限期等待状态：
+以下方法会让线程进入限期等待状体：
 
 - Thread.sleep()
 - 设置了 Timeout 参数的 Object.wait() 方法