Repair uncompilable version 1.62

diff --git a/cmd/smyrna/draw.c b/cmd/smyrna/draw.c
index 6f69f12ba6886747ae56db7bf1c8f408ef5b97fe..bb546e2aa7531ee2e1dd4221c14db961500b9ca5 100755 (executable)
--- a/cmd/smyrna/draw.c
+++ b/cmd/smyrna/draw.c
@@ -472,12 +472,7 @@ static void EmbedText(sdot_op* o, int param)
        y=o->op.u.text.y;
        if (!o->font)
        {
-<<<<<<< draw.c
-
-               o->font=glNewFont(
-=======
                o->font=glNewFont(
->>>>>>> 1.61
                view->widgets,
                o->op.u.text.text,
                &view->penColor,