readme

michisaurio · Mar 12, 2019 · 2db2ed0 · 2db2ed0
1 parent 0ebf6c9
commit 2db2ed0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -8,11 +8,7 @@ PyTorch implementation for this [paper](https://arxiv.org/abs/1612.00496).
 
 At the moment, it takes approximately 0.4s per frame, depending on the number of objects
 detected. An improvement will be speed upgrades soon. Here is the current fastest possible:
-<<<<<<< HEAD
 ![example-video](https://soroushkhadem.com/video/3d-bbox-vid.gif)
-=======
-![example-video](soroushkhadem.com/video/3d-bbox-vid.gif)
->>>>>>> 3e78fc378d40e7dfddddfd3da0cca1e12fda9207
 
 ## Requirements
 - PyTorch