[2/4] fixing merge issues, due to license headers in jndi.prop file

[pr...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/14f704be/products/stratos/conf/jndi.properties
----------------------------------------------------------------------
diff --cc products/stratos/conf/jndi.properties
index 668c24f,e4b3f0e..8345a71
--- a/products/stratos/conf/jndi.properties
+++ b/products/stratos/conf/jndi.properties
@@@ -1,3 -1,24 +1,21 @@@
 -#
 -#
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements.  See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership.  The ASF licenses this file
+ # to you under the Apache License, Version 2.0 (the
+ # "License"); you may not use this file 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.
+ #
 -#
+ 
 -connectionfactoryName=topicConnectionfactory
 -connectionfactory.topicConnectionfactory=amqp://admin:admin@carbon/carbon?brokerlist='tcp://localhost:5677'
 -java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
 +connectionfactoryName=TopicConnectionFactory
 +java.naming.provider.url=tcp://localhost:61616
 +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory