Fixed conflict in rs_commands.cpp

LibreCAD · Sep 16, 2015 · c1d9c3b · c1d9c3b
1 parent 684ab78
commit c1d9c3b
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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")}},