From dfc80bf956a344dcd185f6db2980af7919c52e0d Mon Sep 17 00:00:00 2001
From: Cameron Katri <me@cameronkatri.com>
Date: Wed, 5 May 2021 15:00:19 -0400
Subject: Fix merge conflicts

---
 warp/util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'warp')

diff --git a/warp/util.h b/warp/util.h
index fae72785..a86f5c8d 100644
--- 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>
-- 
cgit v1.2.3-56-ge451