From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Thu, 1 Aug 2013 05:05:40 +0000 (-0700)
Subject: Merge branch 'master' of /opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=2416f3dcb9c90f552302ee5c4cf608fd9a7f3683;hp=4485a622887eafc6174b305983301aa6ea46d4c9;p=clearscm.git

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

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

diff --git a/clearadm/log/clearagent.pl.log b/clearadm/log/clearagent.pl.log
deleted file mode 100644
index 7093a88..0000000
--- a/clearadm/log/clearagent.pl.log
+++ /dev/null
@@ -1,2 +0,0 @@
-clearagent.pl V1.11 started at Mon Jul 15 12:53:49 2013
-20130715@12:53:49 Clearexec V1.18 accepting clients at Mon Jul 15 12:53:49 2013
diff --git a/clearadm/var/run/clearagent.pl.pid b/clearadm/var/run/clearagent.pl.pid
deleted file mode 100644
index 1d08c2a..0000000
--- a/clearadm/var/run/clearagent.pl.pid
+++ /dev/null
@@ -1 +0,0 @@
-10889
diff --git a/clearadm/var/run/cleartasks.pl.pid b/clearadm/var/run/cleartasks.pl.pid
deleted file mode 100644
index e1e320e..0000000
--- a/clearadm/var/run/cleartasks.pl.pid
+++ /dev/null
@@ -1 +0,0 @@
-10906
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>