Updated README.

eth-ait · Jul 6, 2022 · e38d609 · e38d609
1 parent bc84d6c
commit e38d609
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -14,7 +14,6 @@ A set of tools to visualize and interact with sequences of 3D data with cross-pl
 * Support live data feeds and rendering (e.g., webcam).
 * Modern OpenGL shader-based rendering pipeline for high performance (via ModernGL / ModernGL Window).
 
-<<<<<<< HEAD
 ![AITV Interface](https://raw.githubusercontent.com/eth-ait/aitviewer/main/aitv_screenshot.png)
 
 ## Installation