From 60a097624dd5f416c4cfb7295964e3519afaf0f2 Mon Sep 17 00:00:00 2001
From: bdragan <bozanovicdr@gmail.com>
Date: Tue, 9 Aug 2016 22:01:43 +0200
Subject: [PATCH] Fixed a merge error.

---
 .../src/test/java/META-INF/persistence.xml    | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/spring-jpa/src/test/java/META-INF/persistence.xml b/spring-jpa/src/test/java/META-INF/persistence.xml
index ba0d2377d1..922aedbc39 100644
--- a/spring-jpa/src/test/java/META-INF/persistence.xml
+++ b/spring-jpa/src/test/java/META-INF/persistence.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-	<persistence-unit name="punit" >
-		<class>org.baeldung.persistence.model.Foo</class>
-		<class>org.baeldung.persistence.model.Bar</class>
-		<properties>  
-        <property name="javax.persistence.jdbc.user" value="root"/>
-        <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
-        <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/HIBERTEST"/>
-        <property name="javax.persistence.ddl-generation" value="drop-and-create-tables"/>
-        <property name="javax.persistence.logging.level" value="INFO"/>
-        <property name = "hibernate.show_sql" value = "true" />
-        <property name = "hibernate.cache.use_second_level_cache" value = "false" />
-        <property name = "hibernate.cache.use_query_cache" value = "false" />
-      </properties>
-		
-	</persistence-unit>
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+    <persistence-unit name="punit">
+        <class>org.baeldung.persistence.model.Foo</class>
+        <class>org.baeldung.persistence.model.Bar</class>
+        <properties>
+            <property name="javax.persistence.jdbc.user" value="root"/>
+            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/HIBERTEST"/>
+            <property name="javax.persistence.ddl-generation" value="drop-and-create-tables"/>
+            <property name="javax.persistence.logging.level" value="INFO"/>
+            <property name="hibernate.show_sql" value="true"/>
+            <property name="hibernate.cache.use_second_level_cache" value="false"/>
+            <property name="hibernate.cache.use_query_cache" value="false"/>
+        </properties>
+
+    </persistence-unit>
 </persistence>