From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Tue, 6 Aug 2013 15:15:56 +0000 (-0700)
Subject: Merge branch 'master' of /opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=2c6c91a7c5b064230a5908456963a93b37a19c00;hp=5aa0e96439ba703fef8eccf42f322deaeff5d730;p=clearscm.git

Merge branch 'master' of /opt/git/clearscm

Conflicts:
	clearadm/var/run/clearagent.pl.pid
	clearadm/var/run/cleartasks.pl.pid
---

diff --git a/clearadm/var/run/clearagent.pl.pid b/clearadm/var/run/clearagent.pl.pid
deleted file mode 100644
index 9275ea8..0000000
--- a/clearadm/var/run/clearagent.pl.pid
+++ /dev/null
@@ -1 +0,0 @@
-25045
diff --git a/clearadm/var/run/cleartasks.pl.pid b/clearadm/var/run/cleartasks.pl.pid
deleted file mode 100644
index 2022fad..0000000
--- a/clearadm/var/run/cleartasks.pl.pid
+++ /dev/null
@@ -1 +0,0 @@
-24511
diff --git a/maps/log/mapsscrub.log b/maps/log/mapsscrub.log
new file mode 100644
index 0000000..28c06ce
--- /dev/null
+++ b/maps/log/mapsscrub.log
@@ -0,0 +1,6 @@
+                  MAPS Scrubber
+
+User ID           Age  Email    Log   List User's Emails
+----------------- --- ------ ------ ------ -------------
+andrew             30      8     38      1          6323
+Total:            n/a      8     38      1          6323
diff --git a/maps/register.html b/maps/register.html
index 44c1bf7..516a4de 100644
--- a/maps/register.html
+++ b/maps/register.html
@@ -51,7 +51,7 @@ likely move you to my <i>black list</i>.</p>
 
 <div class="copyright">
 
-Copyright &copy; 2001-2005 - All rights reserved<br>
+Copyright &copy; 2001-2013 - All rights reserved<br>
 
 <a href="http://defaria.com/">Andrew DeFaria</a> <a
 href="mailto:Andrew@DeFaria.com">&lt;Andrew@DeFaria.com&gt;</a>