fixed readme (#368)

hpcaitech · May 6, 2024 · 84f1cfd · 84f1cfd
1 parent 93fc50c
commit 84f1cfd
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -53,10 +53,6 @@ With Open-Sora, our goal is to foster innovation, creativity, and inclusivity wi
 | **16s 320×320** | **16s 224×448** | **2s 426×240** |
 | ------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | [<img src="assets/demo/sample_16s_320x320.gif" width="">](https://github.com/hpcaitech/Open-Sora/assets/99191637/3cab536e-9b43-4b33-8da8-a0f9cf842ff2) | [<img src="assets/demo/sample_16s_224x448.gif" width="">](https://github.com/hpcaitech/Open-Sora/assets/99191637/9fb0b9e0-c6f4-4935-b29e-4cac10b373c4) | [<img src="assets/demo/sora_16x426x240_3.gif" width="">](https://github.com/hpcaitech/Open-Sora-dev/assets/99191637/3e892ad2-9543-4049-b005-643a4c1bf3bf) |
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 
 <details>
 <summary>OpenSora 1.0 Demo</summary>