diff --git a/WINGs/Tests/wtest.c b/WINGs/Tests/wtest.c
index 01448144..c81bd085 100644
--- a/WINGs/Tests/wtest.c
+++ b/WINGs/Tests/wtest.c
@@ -505,7 +505,6 @@ testTextField(WMScreen *scr)
}
-#if 0
void
testText(WMScreen *scr)
{
@@ -529,7 +528,6 @@ testText(WMScreen *scr)
if(file) {
char buf[1024];
-<<<<<<< wtest.c
WMFreezeText(text);
while(fgets(buf, 1023, file))
WMAppendTextStream(text, buf);
@@ -539,24 +537,11 @@ testText(WMScreen *scr)
} else {
WMAppendTextStream(text, "Where's the README?");
}
-=======
- WMFreezeText(text);
- while(fgets(buf, 1023, file))
- WMAppendTextStream(text, buf);
-
- fclose(file);
- WMThawText(text);
- WMRefreshText(text, 0, 0);
- } else {
- WMAppendTextStream(text, "Where's the README?");
- }
->>>>>>> 1.12
WMRealizeWidget(win);
WMMapSubwidgets(win);
WMMapWidget(win);
}
-#endif
void