From b0464b8b1f4496a35a6ad3a6bfac5cc9e02101ea Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Sat, 29 Jun 2013 12:34:21 +0100
Subject: fixed after performance version, baffling

---
 06_performance/src/oni.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to '06_performance/src/oni.h')

diff --git a/06_performance/src/oni.h b/06_performance/src/oni.h
index 305d8f1..ed761cb 100644
--- a/06_performance/src/oni.h
+++ b/06_performance/src/oni.h
@@ -43,10 +43,10 @@ class syncOniPlayer{
 			LUT=NULL;
 			makeLUT();
 			playerActive=false;
-<<<<<<< HEAD
+//<<<<<<< HEAD
 			points.reserve(100000); //operator new seems to be causing crshes?
-=======
->>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
+//=======
+//>>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
 		}
 		~syncOniPlayer(){
 			stop();
@@ -95,10 +95,10 @@ class oniManager{
 		int getNumClips();
 		int getNumParticles();
 		syncOniPlayer* getCurrentPlayer();
-<<<<<<< HEAD
+//<<<<<<< HEAD
 		string getCurrentFile();
-=======
->>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
+//=======
+//>>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
 		void update();
 		void drawWindows();
 		void drawCloud(int step);
-- 
cgit v1.2.3