Permalink
Browse files

fixed merge issues

  • Loading branch information...
1 parent 982426e commit 87db0a0fb26cd73a1a21c8ba07ef52a60b66a0de @jmimo committed Apr 4, 2012
Showing with 2 additions and 57 deletions.
  1. +1 −14 COPYRIGHT.txt
  2. +1 −43 NOTICE.txt
View
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-The Netty Icap Protocol Support Project - Copyright 2011 Michael Mimo Moratti, and is licensed under the
+The Netty Icap Protocol Support Project - Copyright 2012 Michael Mimo Moratti, and is licensed under the
Apache License version 2.0 as published by the Apache Software Foundation.
A summary of the individual contributors is given below. Any omission should be
@@ -9,15 +8,3 @@ GIT Login(s) Name
-------------------------------------------------------------------------------
jmimo Michael Mimo Moratti
-------------------------------------------------------------------------------
-=======
-The Netty Icap Protocol Support Project - Copyright 2012 Michael Mimo Moratti, and is licensed under the
-Apache License version 2.0 as published by the Apache Software Foundation.
-
-A summary of the individual contributors is given below. Any omission should be
-sent to Michael Mimo Moratti <icap@mimo.ch>.
-
-GIT Login(s) Name
--------------------------------------------------------------------------------
-jmimo Michael Mimo Moratti
--------------------------------------------------------------------------------
->>>>>>> release-1.0
View
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
The Netty Icap Protocol Support Project
=======================================
@@ -38,45 +37,4 @@ framework implementation, which can be obtained at:
* LICENSE:
* license/LICENSE.felix.txt (Apache License 2.0)
* HOMEPAGE:
-=======
-
- The Netty Icap Protocol Support Project
- =======================================
-
-Please visit the Netty web site for more information:
-
- * http://www.mimo.ch/netty-icap
-
-Copyright 2012 Michael Mimo Moratti.
-
-Michael Mimo Moratti licenses this product to you under the Apache License, version 2.0 (the
-"License"); you may not use this product except in compliance with the License.
-You may obtain a copy of the License at:
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
-
-Also, please refer to each LICENSE.<component>.txt file, which is located in
-the 'license' directory of the distribution file, for the license terms of the
-components that this product depends on.
-
--------------------------------------------------------------------------------
-This product depends on 'Netty'.
-
- * LICENSE:
- * license/LICENSE.netty.txt
- * HOMEPAGE:
- * http://www.jboss.org/netty
-
-This product optionally depends on 'Apache Felix', an open source OSGi
-framework implementation, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.felix.txt (Apache License 2.0)
- * HOMEPAGE:
->>>>>>> release-1.0
- * http://felix.apache.org/
+ * http://felix.apache.org/

0 comments on commit 87db0a0

Please sign in to comment.