From b24c84cd1087f3e60f397d3aaf3b6794bbce40de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Mon, 30 Apr 2012 09:55:31 +0200
Subject: [PATCH] Moved database changeset to the correct file.

FEA: ItEr76S26RemoveExternalCodeFromTemplates
---
 .../src/main/resources/db.changelog-1.2.xml          |  5 +++++
 .../src/main/resources/db.changelog-1.3.xml          | 12 ------------
 .../src/main/resources/db.changelog.xml              |  1 -
 3 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 libreplan-business/src/main/resources/db.changelog-1.3.xml

diff --git a/libreplan-business/src/main/resources/db.changelog-1.2.xml b/libreplan-business/src/main/resources/db.changelog-1.2.xml
index 79a0e2e3e..0c309007d 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.2.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.2.xml
@@ -199,4 +199,9 @@
             columnDataType="VARCHAR(255)" />
     </changeSet>
 
+    <changeSet id="remove-code-from-order_element_template" author="jaragunde">
+        <comment>Remove column code in order_element_template table</comment>
+        <dropColumn tableName="order_element_template" columnName="code" />
+    </changeSet>
+
 </databaseChangeLog>
diff --git a/libreplan-business/src/main/resources/db.changelog-1.3.xml b/libreplan-business/src/main/resources/db.changelog-1.3.xml
deleted file mode 100644
index 628b98a07..000000000
--- a/libreplan-business/src/main/resources/db.changelog-1.3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
-    http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd">
-
-    <changeSet id="remove-code-from-order_element_template" author="jaragunde">
-        <comment>Remove column code in order_element_template table</comment>
-        <dropColumn tableName="order_element_template" columnName="code" />
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/libreplan-business/src/main/resources/db.changelog.xml b/libreplan-business/src/main/resources/db.changelog.xml
index 5011d0a53..0ace5ccf8 100644
--- a/libreplan-business/src/main/resources/db.changelog.xml
+++ b/libreplan-business/src/main/resources/db.changelog.xml
@@ -10,6 +10,5 @@
     <include file="src/main/resources/db.changelog-1.0.xml"/>
     <include file="src/main/resources/db.changelog-1.1.xml"/>
     <include file="src/main/resources/db.changelog-1.2.xml"/>
-    <include file="src/main/resources/db.changelog-1.3.xml"/>
 
 </databaseChangeLog>