From 69f449ebd9e5eb99b24bd9a6dbf17894aa00f945 Mon Sep 17 00:00:00 2001
From: "Philip Sargent  (muscogee)" <philip.sargent@gmail.com>
Date: Fri, 21 Feb 2020 16:44:10 +0000
Subject: [PATCH] revert OllyB to Ol as nickname. Fix bug in script.

---
 folk/folk.csv            | 2 +-
 scripts/make-folklist.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/folk/folk.csv b/folk/folk.csv
index af2b298a7..26d5a0ee8 100644
--- a/folk/folk.csv
+++ b/folk/folk.csv
@@ -21,7 +21,7 @@ Katey Bender,Bender,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,1,1,,,
 Stuart Bennett,Bennett,,,l/stuartb.htm,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,,-1,,,,,1,,,,,,,,
 Matthew Bent,Bent,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,
 Morven Beranek-Stanley,Beranek-Stanley,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
-Olly Betts (OllyB),Betts,,,i/olly.jpg,,,,,,,,,,,,,,,1,1,1,,1,,1,,,-1,1,1,1,,1,1,1,1,,,,,1,1,,1,1,,,,
+Olly Betts (Ol),Betts,,,i/olly.jpg,,,,,,,,,,,,,,,1,1,1,,1,,1,,,-1,1,1,1,,1,1,1,1,,,,,1,1,,1,1,,,,
 John Billings,Billings,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,,,,,,,,,,,,,
 Paul Bilton,Bilton,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,
 Steve Bishop,Bishop,,,i/bishop.jpg,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
diff --git a/scripts/make-folklist.py b/scripts/make-folklist.py
index f8eb74865..3537c25ed 100755
--- a/scripts/make-folklist.py
+++ b/scripts/make-folklist.py
@@ -136,7 +136,7 @@ y1 = lastyear-1
 print """
 <p>Links to recent expos: <a href="http://expo.survex.com/expedition/%s">last year</a>  
 <hr /><table class="fancy">
-""" % y1,y1
+""" % y1
 
 print output