From 22b49b27e4bdfbe0757bfc6257af96d65d8b0eff Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Mon, 21 Mar 2011 00:44:44 +0100
Subject: [PATCH] oeps.

---
 util/MP4/box.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/util/MP4/box.cpp b/util/MP4/box.cpp
index 1e5a5424..46412680 100644
--- a/util/MP4/box.cpp
+++ b/util/MP4/box.cpp
@@ -46,8 +46,6 @@ class Box {
     uint8_t * Payload;
     BoxHeader header;
     uint32_t PayloadSize;
-  private:
-    BoxHeader header;
 };//Box Class
 
 Box::Box() {
@@ -177,7 +175,6 @@ void Box::ResetPayload( ) {
     Payload = NULL;
   }
 }
-<<<<<<< HEAD
 
 void Box::Parse( std::string PrintOffset ) {
   if( header.BoxType == 0x61627374 ) {
@@ -399,5 +396,4 @@ void Box::Parse( std::string PrintOffset ) {
               << "' not yet implemented!\n";
   }
 }
-=======
->>>>>>> 7520f5799f3da3c1a89a28fd4d62358b0028d8d2
+