From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 20:26:56 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.92^2~14
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=9c5b35854287dfb22fea4fd1c8a31b085b49176b;hp=9772e6f24294e4a5507a9fd64d6fdb8bb56f106f;p=feisty_meow.git

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

diff --git a/temp/mod1 b/temp/mod1
deleted file mode 100644
index 7aff7ce4..00000000
--- a/temp/mod1
+++ /dev/null
@@ -1 +0,0 @@
-arf
diff --git a/temp/mod2 b/temp/mod2
deleted file mode 100644
index 445727d3..00000000
--- a/temp/mod2
+++ /dev/null
@@ -1 +0,0 @@
-sdiuis
diff --git a/temp/mod3 b/temp/mod3
deleted file mode 100644
index 2f55af39..00000000
--- a/temp/mod3
+++ /dev/null
@@ -1 +0,0 @@
-farkle
diff --git a/temp/mod4 b/temp/mod4
deleted file mode 100644
index 2f55af39..00000000
--- a/temp/mod4
+++ /dev/null
@@ -1 +0,0 @@
-farkle
diff --git a/temp/mod5 b/temp/mod5
deleted file mode 100644
index 440c7d7c..00000000
--- a/temp/mod5
+++ /dev/null
@@ -1 +0,0 @@
-pustulingus
diff --git a/temp/mod6 b/temp/mod6
deleted file mode 100644
index 0f12a484..00000000
--- a/temp/mod6
+++ /dev/null
@@ -1 +0,0 @@
-muttgrabbers