From 49f1e451a96e0ef39bc0eb2864b8ae5ff6ced04b Mon Sep 17 00:00:00 2001
From: suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 10 Jul 2013 14:27:29 +0200
Subject: [PATCH] tiny conflict resolution

---
 src/surf/storage_private.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/surf/storage_private.h b/src/surf/storage_private.h
index 8f8aad96b3..d0a7265121 100644
--- a/src/surf/storage_private.h
+++ b/src/surf/storage_private.h
@@ -47,7 +47,6 @@ typedef struct surf_storage {
   size_t size;
   size_t used_size;
   char *type_id;
-  char *content_type;
   xbt_dynar_t write_actions;
 } s_storage_t, *storage_t;
 
-- 
2.20.1