Fix merge conflicts

diff --git a/Makefile b/Makefile
index fbb0be58618401312e6906f09c3d1485f8d0dd2c..4aa82ef0e1744213b4e2d064db076b92cb780d29 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ config.h:
 
 update:
        TEMP=$$(mktemp -d); \
-       cd ~/Documents/BSD/NetBSD; \
+       cd ~/Documents/NetBSD; \
        git format-patch -o $$TEMP $(shell cat upstream-commit) games; \
        git rev-list HEAD -1 games/ > $(ROOT)/upstream-commit; \
        cd $(ROOT); \

diff --git a/boggle/boggle/prtable.c b/boggle/boggle/prtable.c
index 84421678d625bee386a7200a1641b6bfff3c0bfa..67d3484b55507dd1751839905bd033f058c66264 100644 (file)
--- a/boggle/boggle/prtable.c
+++ b/boggle/boggle/prtable.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: prtable.c,v 1.10 2013/10/19 17:23:08 christos Exp $    */
+/*     $NetBSD: prtable.c,v 1.11 2021/05/02 12:50:43 rillig Exp $      */
 
 /*-
  * Copyright (c) 1993
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: prtable.c,v 1.10 2013/10/19 17:23:08 christos Exp $");
+__RCSID("$NetBSD: prtable.c,v 1.11 2021/05/02 12:50:43 rillig Exp $");
 #endif /* not lint */
 
 #include <ncurses.h>
@@ -58,14 +58,14 @@ static int  get_maxlen(const char *const [], int, int (*)(const char *const *, in
  *     width   - max line width if not zero
  *     prentry - address of the routine to call to print the string
  *     length  - address of the routine to call to determine the length
- *               of string to be printed 
+ *               of string to be printed
  *
  * prtable and length are called with the address of the base and
  * an index
  */
 void
-prtable(const char *const base[], int num, int d_cols, int width, 
-        void (*prentry)(const char *const [], int), 
+prtable(const char *const base[], int num, int d_cols, int width,
+        void (*prentry)(const char *const [], int),
         int (*length)(const char *const [], int))
 {
         int c, j;
@@ -114,7 +114,7 @@ prtable(const char *const base[], int num, int d_cols, int width,
 }
 
 static int
-get_maxlen(const char *const base[], int num, 
+get_maxlen(const char *const base[], int num,
            int (*length)(const char *const *, int))
 {
        int i, len, max;

diff --git a/upstream-commit b/upstream-commit
index 09b84e941c8b2fabe9f31af29dce12ce8bc8d065..1fcb00de10ebc145aba03cd59d3ea9acd47e5467 100644 (file)
--- a/upstream-commit
+++ b/upstream-commit
@@ -1 +1 @@
-0655447cec1e22ba0b95a13d8f1b56cc4c2cb699
+9771de16f1f447976898449d1313d7cd84a6c990

diff --git a/warp/util.h b/warp/util.h
index fae72785f6eebf6706bb6ba7759691fb3b7cbb7b..a86f5c8d8dc94048442e6195f21f716794e74469 100644 (file)
--- a/warp/util.h
+++ b/warp/util.h
@@ -3,7 +3,7 @@
 /* Log:        util.h,v
  * Revision 7.0  86/10/08  15:14:37  lwall
  * Split into separate files.  Added amoebas and pirates.
- * 
+ *
  */
 
 #include <time.h>