update readme + rm useless part

XiSHEN0220 · Jul 20, 2020 · 403ac8c · 403ac8c
1 parent e5a78fa
commit 403ac8c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
@@ -121,7 +121,7 @@ If our project is helpful for your research, please consider citing :
 </table>
 </p>
 
-<<<<<<< HEAD
+
 **Other results (such as: aligning duplicated artworks, optical flow, localization etc.) can be seen in [our paper](https://arxiv.org/abs/2004.01526).**