Mailing-List: contact commits-help@guacamole.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@guacamole.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jmuehlner@apache.org
To: commits@guacamole.incubator.apache.org
Date: Tue, 29 Nov 2016 17:50:05 -0000
Message-Id: <1017e9dbd15042b5bc0d2b60b90a83f1@git.apache.org>
In-Reply-To: <079742e84937489bab7658f890873097@git.apache.org>
References: <079742e84937489bab7658f890873097@git.apache.org>
Subject: [2/6] incubator-guacamole-client git commit: GUACAMOLE-131: Re-remove
 JavaScript libraries which were mistakenly re-added during merge conflict
 resolution.
archived-at: Tue, 29 Nov 2016 17:50:08 -0000

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/e385bfcd/guacamole/src/main/webapp/lib/messageformat/LICENSE
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/lib/messageformat/LICENSE b/guacamole/src/main/webapp/lib/messageformat/LICENSE
deleted file mode 100644
index 6b9ea5b..0000000
--- a/guacamole/src/main/webapp/lib/messageformat/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright 2012-2016 Alex Sexton, Eemeli Aro, and Contributors
-
-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, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.