Fix merge conflicts

[bsdgames-darwin.git] / tetris / screen.h

diff --git a/tetris/screen.h b/tetris/screen.h
index 99779e07a1d8dc51525e319c797e9f79ea020cec..c0b39053158db7f01137d6fb5f9bc1ae7214a069 100644 (file)
--- a/tetris/screen.h
+++ b/tetris/screen.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: screen.h,v 1.8 2004/01/27 20:30:30 jsm Exp $   */
+/*     $NetBSD: screen.h,v 1.9 2009/08/12 08:51:21 dholland Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -45,7 +45,6 @@ extern char *SOstr;           /* begin standout mode */
  */
 #define        putpad(s)       tputs(s, 1, put)
 
-void    moveto(int, int);
 int    put(int);               /* just calls putchar; for tputs */
 void   scr_clear(void);
 void   scr_end(void);