From 98ec470a4f7de9a9a2d9cdf24f08625e44cb66b5 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Thu, 7 Mar 2013 14:47:18 +0100
Subject: [PATCH] The Merge
---
src/main/webapp/WEB-INF/spring/spring-main.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/WEB-INF/spring/spring-main.xml b/src/main/webapp/WEB-INF/spring/spring-main.xml
index f9f031bae..83ceaf9c0 100644
--- a/src/main/webapp/WEB-INF/spring/spring-main.xml
+++ b/src/main/webapp/WEB-INF/spring/spring-main.xml
@@ -47,11 +47,11 @@
<!-- Example of connector client configuration -->
<!-- Uncomment bean definition to activate connector -->
- <bean id="connectorClient" scope="singleton" class="de.thm.arsnova.connector.client.ConnectorClientImpl">
+ <!-- bean id="connectorClient" scope="singleton" class="de.thm.arsnova.connector.client.ConnectorClientImpl">
<property name="serviceLocation" value="${connector.uri}"></property>
<property name="username" value="${connector.username}"></property>
<property name="password" value="${connector.password}"></property>
- </bean>
+ </bean -->
<http:access-control allow-origin="*" allow-methods="GET" />
</beans>
--
GitLab