Removed merge conflicts

1 files changed, 0 insertions, 14 deletions

diff --git a/navit/plugin.h b/navit/plugin.h
index 9d2a082b9..8a9fba0d7 100644
--- a/navit/plugin.h
+++ b/navit/plugin.h
@@ -25,19 +25,6 @@ extern "C" {
 
 struct plugin;
 
-/*<<<<<<< HEAD
-enum plugin_type {
-	plugin_type_graphics,
-	plugin_type_gui,
-	plugin_type_map,
-	plugin_type_osd,
-	plugin_type_speech,
-	plugin_type_vehicle,
-	plugin_type_event,
-	plugin_type_font,
-	plugin_type_audio,
-	plugin_type_last,
-//=======*/
 /**
  * @brief All existing plugin categories.
  *
@@ -66,7 +53,6 @@ enum plugin_category {
 	plugin_category_audio,
 	/** Dummy for last entry. */
 	plugin_category_last,
-//>>>>>>> navit/trunk
 };
 #endif