From: erg <devnull@localhost>
Date: Thu, 22 Jul 2010 15:50:26 +0000 (+0000)
Subject: Repair uncompilable version 1.62
X-Git-Tag: LAST_LIBGRAPH~32^2~1249
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97fb5db8e1b3f08653d80e4ff316971421645294;p=graphviz

Repair uncompilable version 1.62
---

diff --git a/cmd/smyrna/draw.c b/cmd/smyrna/draw.c
index 6f69f12ba..bb546e2aa 100755
--- 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,