From 5f12ac92f5b75d7f2573430784121d7e5ed7b74b Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 5 Dec 2017 11:01:01 +0800 Subject: [PATCH] Modify by patch B Change-Id: I8813dc7a6849b82305966ec5ab7e00efe494e813 --- dependency_test | 1 + 1 file changed, 1 insertion(+) diff --git a/dependency_test b/dependency_test index 175447f3a..c4db19002 100644 --- a/dependency_test +++ b/dependency_test @@ -1 +1,2 @@ Modify by patch A (Modify to conflict) +Modify by patch B (Update 2)