Remove redundant COPYRIGHT; add trailing newline for COPYING

diff --git a/COPYING b/COPYING
index 3ed1e7d..49adc72 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -14,4 +14,4 @@ implied warranties of any kind.
 The University of Michigan
 c/o UM Webmaster Team
 4251 Plymouth Road
-Ann Arbor, MI 48105-2785
\ No newline at end of file
+Ann Arbor, MI 48105-2785

diff --git a/COPYRIGHT b/COPYRIGHT
deleted file mode 100644 (file)
index a3d75df..0000000
--- a/COPYRIGHT
+++ /dev/null
@@ -1,10 +0,0 @@
-Copyright 2005 Regents of The University of Michigan 
-All Rights Reserved.
-
-Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of The University of Michigan not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. This software is supplied as is without expressed or implied warranties of any kind.
-
-The University of Michigan
-c/o UM Webmaster Team
-4251 Plymouth Road
-Ann Arbor, MI 48105-2785
-