From c1d9c3b0c7d929b812c935ffc23efe94a2537fbd Mon Sep 17 00:00:00 2001 From: Jerry Date: Wed, 16 Sep 2015 16:18:19 +0200 Subject: [PATCH] Fixed conflict in rs_commands.cpp --- librecad/src/cmd/rs_commands.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/librecad/src/cmd/rs_commands.cpp b/librecad/src/cmd/rs_commands.cpp index 9137745906..c91414de21 100644 --- a/librecad/src/cmd/rs_commands.cpp +++ b/librecad/src/cmd/rs_commands.cpp @@ -202,15 +202,12 @@ RS_Commands::RS_Commands() { {{"c3", QObject::tr("c3", "circle 3 points")}}, RS2::ActionDrawCircle3P }, -<<<<<<< HEAD -======= //draw circle with point and radius { - {{"circlecr", QObject::tr("circlepr", "circle with center and radius")}}, + {{"circlecr", QObject::tr("circlecr", "circle with center and radius")}}, {{"cc", QObject::tr("cc", "circle with center and radius")}}, RS2::ActionDrawCircleCR }, ->>>>>>> 20d9ab4... Added help tip, shortcut command & corrected bug //draw circle tangent to 3 objects { {{"tan3", QObject::tr("tan3", "circle tangent to 3")}},