cleanup

hw/hw3/starter-code/lib/LICENSE.slf4j.txt

-Copyright (c) 2004-2007 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-

hw/hw3/starter-code/lib/README

-junit-4.5.jar
-* http://junit.sourceforge.net/
-* CPL (free for all use)
-
-zql.jar
-* http://www.gibello.com/code/zql/
-* Free for non-commercial use
-
-JLine
-* http://jline.sourceforge.net/
-* BSD (free for all use)
-<<<<<<< .working
-
-mina-core-2.0.4.jar
-mina-filter-compression-2.0.4.jar
-* http://mina.apache.org/
-* Apache License v2.0 (free for all use)
-
-slf4j-api-1.6.1.jar
-* http://www.slf4j.org/license.html
-* MIT license (free for all use)
-
-jzlib-1.0.7.jar
-* http://www.jcraft.com/jzlib/
-* BSD (free for all use)
-
-javassist-3.16.1-GA.jar
-* http://www.javassist.org/
-* MPL v1.1, LGPL and Apache License
-
-=======
-
-mina-core-2.0.4.jar
-mina-filter-compression-2.0.4.jar
-* http://mina.apache.org/
-* Apache License v2.0 (free for all use)
-
-slf4j-api-1.6.1.jar
-slf4j-log4j12-1.6.1.jar
-* http://www.slf4j.org/license.html
-* MIT license (free for all use)
-
-jzlib-1.0.7.jar
-* http://www.jcraft.com/jzlib/
-* BSD (free for all use)
-
-javassist-3.16.1-GA.jar
-* http://www.javassist.org/
-* MPL v1.1, LGPL and Apache License
-
-ant-contrib-1.0b3.jar
-* http://ant-contrib.sourceforge.net/
-* Apache Software License
-
-log4j-1.2.17.jar
-* logging.apache.org/log4j/1.2/
-* Apache Software license 2.0
-
-
->>>>>>> .merge-right.r755