From 7b707e4e5c1c2c0f1445b28ba13b9e7e84a84a55 Mon Sep 17 00:00:00 2001
From: Wxwei <12221108@zju.edu.cn>
Date: Thu, 16 Nov 2023 11:33:28 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'README.md'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index ccc69fe..2ca6ea0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SAGNet: Structure-aware Generative Network for 3D-Shape Modeling
 by [Zhijie Wu](https://zhijiew94.github.io/), Xiang Wang, [Di Lin](https://vcc.tech/Di_Lin/), [Dani Lischinski](http://danix3d.droppages.com/), [Daniel Cohen-Or](http://www.math.tau.ac.il/~dcor/), [Hui Huang](https://vcc.tech/~huihuang)