From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 17:48:23 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.91^2~19
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=154c324a33c8566c9f10dae55f6cadaf30862338;hp=14c275d09cf51f1573b4aebd945072a6e9567b28;p=feisty_meow.git

Merge branch 'master' of feistymeow.org:feisty_meow into dev

fubar borkistan
---

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 291789f1..8c714ece 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -91,6 +91,7 @@ function do_checkin()
         git commit .
         test_or_die "git commit"
       fi
+
 #      # upload the files to the server so others can see them.
 #      git push 2>&1 | grep -v "X11 forwarding request failed"
 #      if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
diff --git a/temp/mod1 b/temp/mod1
new file mode 100644
index 00000000..7aff7ce4
--- /dev/null
+++ b/temp/mod1
@@ -0,0 +1 @@
+arf