change readme.md

zhang-stephen · zhang-stephen · commit 7447a3d9c8c4 · 2017-03-22T00:43:49.000+08:00
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 # STM_Template 
 This is a Template for developers of STM32F407ZGTx and it surpports to DSP &amp; RTOS developing.
-<<<<<<< HEAD
 ## These are the note of this Template
 
 But my English is so poor, so this note is in Chinese(simplified). 
@@ -29,6 +28,4 @@ But my English is so poor, so this note is in Chinese(simplified).
 ---
 #### yicheng2623825899@gmail.com
 ---
-=======
 #### Please view readme.txt in every directory(if it exists)
->>>>>>> c73fcc93c5f6af872e84087f34caf91cd1b1930d
diff --git a/STM_Template b/STM_Template
@@ -0,0 +1 @@
+Subproject commit 1bcc1aaf05785c1d1281100a8eef7efffaf74692

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit 1bcc1aaf05785c1d1281100a8eef7efffaf74692`