From 4b4c40f5399fde9c0dece672073de6e42ca598a5 Mon Sep 17 00:00:00 2001
From: CyC2018 <1029579233@qq.com>
Date: Sat, 3 Mar 2018 20:57:33 +0800
Subject: [PATCH] 1

---
 notes/设计模式.md                             |   6 +++++-
 pics/09e398d8-9c6e-48f6-b48b-8b4f9de61d1d.png | Bin 1024 -> 0 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)
 delete mode 100644 pics/09e398d8-9c6e-48f6-b48b-8b4f9de61d1d.png

diff --git a/notes/设计模式.md b/notes/设计模式.md
index 484e0ca1..7cf36ed2 100644
--- a/notes/设计模式.md
+++ b/notes/设计模式.md
@@ -35,11 +35,15 @@
 
 
 
-需要说明的一点是，文中的 UML 类图和规范的 UML 类图不大相同，其中组合关系使用以下箭头表示：
+需要说明的一点是，文中的 UML 图和规范的 UML 不大相同，其中组合关系使用以下箭头表示：
 
+<<<<<<< HEAD
 
 
 ![](https://github.com/CyC2018/InterviewNotes/blob/master/pics//09e398d8-9c6e-48f6-b48b-8b4f9de61d1d.png)
+=======
+![](https://github.com/CyC2018/InterviewNotes/blob/master/pics//df48ea1b-3069-4fb7-93c0-4c8a26c7ed7c.png)
+>>>>>>> parent of 8e81bfc... auto commit
 
 
 
diff --git a/pics/09e398d8-9c6e-48f6-b48b-8b4f9de61d1d.png b/pics/09e398d8-9c6e-48f6-b48b-8b4f9de61d1d.png
deleted file mode 100644
index 908ebe925163f93ca7f09cd7619b9d4e06230601..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmeAS@N?(olHy`uVBq!ia0vp^`9Q3}!3HEh%viDoNHG=%xjQkeJ16rJ$YDu$^mSxl
z*x1kgCy^D%=PdAuEM{QfI}E~%$MaXD05vpux;TbZ#J#<)xcX3l#IcXRD|PC)9R*zi
zHaqHQGtWMnvgwUBhwvM=jhWFCRF5i&B^qqD2)I)`b57FD((N+x6?Grj&T~(*Pv0fa
zp?g$$S;Y~N{uz%1gKd(!+<iWFXv!I45uB&mf1KHK(hUFqiz}wFI5s>i==fXLZ{mA4
z)37W3<ii4o{rBA$Up$bs@xb3Y^V#P$=ebTl%{uS-!l0E2Ml%)qk~jbCc@#PA?vAHL
zooSmp<JPwu@O-SXJ8O17de56~ld`n!w+|M|TzOskV_$yPlj`p4SzAq}ExY`3LDbqs
zAzBM#^kysly!Ytr^Wxs6GtZ_K#C{jmt8S@t+Fu#3P<?;4-|`h#vm|=mEav*9P4@q&
zV=dP&!Naz`;O5)iaqH7Qn;+e*vO9P6Rj#*X(s%R3Z@=C4;q<OYk(=Vy$JYlOdu+H!
z!)W<Yjd`liKTFO&%eMXY**PN1@dV06raDH(@4IIU>0f;Tj3Ne4S3j3^P6<sQ_9z$)
I0i+NB06Z$&YybcN