1 files changed, 1 insertions, 9 deletions
diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
index d0f52775a..c6959b718 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
@@ -129,12 +129,8 @@ void FilletChamferPropertiesDialog::showDialog(
     const gchar *unit,
     bool use_distance,
     bool aprox_radius,
-<<<<<<< TREE
-    Glib::ustring const * documentUnit,
+    Glib::ustring documentUnit,
     Geom::Satellite satellite)
-=======
-    Glib::ustring documentUnit)
->>>>>>> MERGE-SOURCE
 {
     FilletChamferPropertiesDialog *dialog = new FilletChamferPropertiesDialog();
 
@@ -265,7 +261,6 @@ void FilletChamferPropertiesDialog::_set_unit(const gchar *abbr)
     unit = abbr;
 }
 
-<<<<<<< TREE
 void FilletChamferPropertiesDialog::_set_amount(double amm)
 {
     amount = amm;
@@ -274,10 +269,7 @@ void FilletChamferPropertiesDialog::_set_amount(double amm)
 
 
 
-void FilletChamferPropertiesDialog::_set_document_unit(Glib::ustring const *abbr)
-=======
 void FilletChamferPropertiesDialog::_set_document_unit(Glib::ustring abbr)
->>>>>>> MERGE-SOURCE
 {
     document_unit = abbr;
 }