From: suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 10 Jul 2013 12:27:29 +0000 (+0200)
Subject: tiny conflict resolution
X-Git-Tag: v3_9_90~167
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/49f1e451a96e0ef39bc0eb2864b8ae5ff6ced04b?ds=sidebyside

tiny conflict resolution
---

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;