From 26d6569602e0477eaecb3a146ad9808f9b3dc298 Mon Sep 17 00:00:00 2001
From: Dario Zubovic <dzubovic@aad.hr>
Date: Fri, 16 Sep 2016 18:42:25 +0200
Subject: [PATCH] screwed up last commit

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 81b710e..5f13457 100644
--- a/README.md
+++ b/README.md
@@ -10,11 +10,7 @@ Metaball functions are envaluated on GPU or CPU, but GPU mode performs about 10x
 Where *r* is radius of the metaball, and *d* is distance from metaball's center to current point. Additional functions can be quickly added as a new compute shader based on the existing one.
 
 ## TODO list:
-<<<<<<< HEAD
 * add more falloff functions
-=======
-* add more fallof functions
->>>>>>> 1c23f6aa55034b85387946d2b79bc9e542b0f215
 * move marching cubes algorithm to GPU
 * create example scene with rigidbody metaballs