resolve article conflics

leijing1992 · Feb 26, 2017 · d53e014 · d53e014
1 parent 6255d52
commit d53e014
Showing 1 changed file with 2 additions and 61 deletions.
diff --git a/group17/article/写一篇文章介绍cpu, 内存, 磁盘, 指令以及他们之间的关系_20170226.md b/group17/article/写一篇文章介绍cpu, 内存, 磁盘, 指令以及他们之间的关系_20170226.md
@@ -1,61 +1,3 @@
-<<<<<<< HEAD
-# 写一篇文章介绍cpu, 内存, 磁盘, 指令以及他们之间的关系
-
-## 须知
----
-
-交作业时请在QQ 号后面填上各自的文章链接, 比如:
-
-51075907 http://m.blog.csdn.net/article/details?id=57083764
-
-## 文章
----
-
-1204187480
-
-102228177  http://note.youdao.com/noteshare?id=74a51e7f93461dfb77c69a1cf4755624&sub=004F10FA5D2046ABAA060F19C0D2A18F
-
-876385982 http://www.totoro-fly.com/?p=59
-
-785396327
-
-1059107701
-
-240094626
-
-82427129 http://blog.csdn.net/walk_er/article/details/57406278
-
-296910598
-
-1264835468 http://www.jianshu.com/p/191d731ec00a
-
-516886559
-
-1282579502
-
-614982500
-
-865797761
-
-1540186032  http://blog.csdn.net/mpx_xb/article/details/56679603
-
-176653813
-
-116665530
-
-51075907 http://m.blog.csdn.net/article/details?id=57083764
-
-1158154002
-
-345450234
-
-919764878
-
-1368331120
-
-517970312
-
-=======
 # 写一篇文章介绍cpu, 内存, 磁盘, 指令以及他们之间的关系
 
 ## 须知
@@ -78,13 +20,13 @@
 
 1059107701
 
-240094626 http://note.youdao.com/noteshare?id=d129c169ed611f6099b96e8e0f3f5c51
+240094626
 
 82427129 http://blog.csdn.net/walk_er/article/details/57406278
 
 296910598
 
-1264835468
+1264835468 http://www.jianshu.com/p/191d731ec00a
 
 516886559
 
@@ -112,4 +54,3 @@
 
 517970312
 
->>>>>>> 010e684c4c4c4045edb71297220b50bcb9dea8eb