Update README.md

张维为陈平曹丰泽等知名言论收集/README.md

@@ -4,10 +4,8 @@
 
 [海精专家曹丰泽](./曹丰泽/README.md)
 
-<<<<<<< HEAD
-=======
 [都可以谈张维为](./张维为/README.md)
->>>>>>> upstream/main
+
 ![在中国这种地方，不需要囤积基本物资](https://github.com/jiayouba233/run/blob/main/%E5%BC%A0%E7%BB%B4%E4%B8%BA%E9%99%88%E5%B9%B3%E6%9B%B9%E4%B8%B0%E6%B3%BD%E7%AD%89%E7%9F%A5%E5%90%8D%E8%A8%80%E8%AE%BA%E6%94%B6%E9%9B%86/%E6%9B%B9%E4%B8%B0%E6%B3%BD/%E5%9C%A8%E4%B8%AD%E5%9B%BD%E8%BF%99%E7%A7%8D%E5%9C%B0%E6%96%B9%EF%BC%8C%E4%B8%8D%E9%9C%80%E8%A6%81%E5%9B%A4%E7%A7%AF%E5%9F%BA%E6%9C%AC%E7%89%A9%E8%B5%84.jpg)
 ![海量专家精确计算](https://github.com/jiayouba233/run/blob/main/%E5%BC%A0%E7%BB%B4%E4%B8%BA%E9%99%88%E5%B9%B3%E6%9B%B9%E4%B8%B0%E6%B3%BD%E7%AD%89%E7%9F%A5%E5%90%8D%E8%A8%80%E8%AE%BA%E6%94%B6%E9%9B%86/%E6%9B%B9%E4%B8%B0%E6%B3%BD/%E6%B5%B7%E4%B8%93%E7%B2%BE%E7%AE%97%E6%AF%94%E6%88%91%E6%87%82%E6%9B%B4%E6%AF%94%E4%BD%A0%E6%87%82.jpg)
 
@@ -15,28 +13,23 @@
 
 [不等式大师陈平](./陈平/README.md)
 
-<<<<<<< HEAD
-=======
+
 [叼盘神手胡锡近](./胡锡进/README.md)
->>>>>>> upstream/main
+
 ![张维为_都可以谈](https://github.com/jiayouba233/run/blob/main/%E5%BC%A0%E7%BB%B4%E4%B8%BA%E9%99%88%E5%B9%B3%E6%9B%B9%E4%B8%B0%E6%B3%BD%E7%AD%89%E7%9F%A5%E5%90%8D%E8%A8%80%E8%AE%BA%E6%94%B6%E9%9B%86/%E5%BC%A0%E7%BB%B4%E4%B8%BA/%E5%BC%A0%E7%BB%B4%E4%B8%BA_%E9%83%BD%E5%8F%AF%E4%BB%A5%E8%B0%88.jpg)
 
 [IP 鉴谍师沈逸](./沈逸/README.md)
 
 [其他名人名言](./其他/README.md)
 
-<<<<<<< HEAD
-=======
 ## 部分名场面
->>>>>>> upstream/main
 ![金灿荣_双赢](https://github.com/jiayouba233/run/blob/main/%E5%BC%A0%E7%BB%B4%E4%B8%BA%E9%99%88%E5%B9%B3%E6%9B%B9%E4%B8%B0%E6%B3%BD%E7%AD%89%E7%9F%A5%E5%90%8D%E8%A8%80%E8%AE%BA%E6%94%B6%E9%9B%86/%E9%87%91%E7%81%BF%E8%8D%A3/%E9%87%91%E7%81%BF%E8%8D%A3_%E5%8F%8C%E8%B5%A2.jpg)
 
 ![曹丰泽 海精专](./曹丰泽/海专精算比我懂更比你懂.jpg)
 
 ![金灿荣 双赢](./金灿荣/金灿荣_双赢.jpg)
 
-<<<<<<< HEAD
-=======
+
 ![张维为 都可以谈](./张维为/张维为_都可以谈.jpg)
->>>>>>> upstream/main
+
 ![李子暘论自由](https://github.com/jiayouba233/run/blob/main/%E5%BC%A0%E7%BB%B4%E4%B8%BA%E9%99%88%E5%B9%B3%E6%9B%B9%E4%B8%B0%E6%B3%BD%E7%AD%89%E7%9F%A5%E5%90%8D%E8%A8%80%E8%AE%BA%E6%94%B6%E9%9B%86/%E6%9D%8E%E5%AD%90%E6%9A%98/%E6%9D%8E%E5%AD%90%E6%9A%98%E8%AE%BA%E8%87%AA%E7%94%B1.png)