tiny conflict resolution

diff --git a/src/surf/storage_private.h b/src/surf/storage_private.h
index 8f8aad9..d0a7265 100644 (file)
--- 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;
   size_t size;
   size_t used_size;
   char *type_id;

-  char *content_type;

   xbt_dynar_t write_actions;
 } s_storage_t, *storage_t;
 
   xbt_dynar_t write_actions;
 } s_storage_t, *storage_t;