Removed merge conflicts

1 files changed, 0 insertions, 23 deletions

diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c
index ea5783b4d..0042dafb2 100644
--- a/navit/osd/core/osd_core.c
+++ b/navit/osd/core/osd_core.c
@@ -4047,28 +4047,6 @@ osd_audio_player_new(struct navit *nav, struct osd_methods *meth, struct attr **
 void
 plugin_init(void)
 {
-/*<<<<<<< HEAD
-	plugin_register_osd_type("compass", osd_compass_new);
-	plugin_register_osd_type("navigation_next_turn", osd_nav_next_turn_new);
-	plugin_register_osd_type("button", osd_button_new);
-	plugin_register_osd_type("toggle_announcer", osd_nav_toggle_announcer_new);
-	plugin_register_osd_type("speed_warner", osd_speed_warner_new);
-	plugin_register_osd_type("speed_cam", osd_speed_cam_new);
-	plugin_register_osd_type("text", osd_text_new);
-	plugin_register_osd_type("gps_status", osd_gps_status_new);
-	plugin_register_osd_type("volume", osd_volume_new);
-	plugin_register_osd_type("scale", osd_scale_new);
-	plugin_register_osd_type("image", osd_image_new);
-	plugin_register_osd_type("stopwatch", osd_stopwatch_new);
-	plugin_register_osd_type("odometer", osd_odometer_new);
-	plugin_register_osd_type("auxmap", osd_auxmap_new);
-	plugin_register_osd_type("cmd_interface", osd_cmd_interface_new);
-	plugin_register_osd_type("route_guard", osd_route_guard_new);
-	plugin_register_osd_type("navigation_status", osd_navigation_status_new);
-#ifdef USE_AUDIO_FRAMEWORK
-	plugin_register_osd_type("audio_player", osd_audio_player_new);
-#endif
-=======*/
 	plugin_register_category_osd("compass", osd_compass_new);
 	plugin_register_category_osd("navigation_next_turn", osd_nav_next_turn_new);
 	plugin_register_category_osd("button", osd_button_new);
@@ -4089,5 +4067,4 @@ plugin_init(void)
 #ifdef USE_AUDIO_FRAMEWORK
 	plugin_register_category_osd("audio_player", osd_audio_player_new);
 #endif
-//>>>>>>> navit/trunk
 }