From ca2236303fd4bf6a59d67d068b46285cc1306066 Mon Sep 17 00:00:00 2001
From: Shubhra <shubhi.srvstv@gmail.com>
Date: Fri, 13 Mar 2020 00:21:20 +0530
Subject: [PATCH] BAEL-3298 Some merge changes

---
 .../src/test/resources/output/batchRetry/retryOutput.xml        | 2 +-
 spring-batch/xml/retryOutput.xml                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-batch/src/test/resources/output/batchRetry/retryOutput.xml b/spring-batch/src/test/resources/output/batchRetry/retryOutput.xml
index 0de35670f4..4cc8db7542 100644
--- a/spring-batch/src/test/resources/output/batchRetry/retryOutput.xml
+++ b/spring-batch/src/test/resources/output/batchRetry/retryOutput.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><transactionRecord><transactionRecord><age>10</age><amount>10000.0</amount><postCode>430222</postCode><transactionDate>2015-10-31T00:00:00+05:30</transactionDate><userId>1234</userId><username>sammy</username></transactionRecord><transactionRecord><age>10</age><amount>12321.0</amount><postCode>430222</postCode><transactionDate>2015-12-03T00:00:00+05:30</transactionDate><userId>9999</userId><username>john</username></transactionRecord></transactionRecord>
+<?xml version="1.0" encoding="UTF-8"?><transactionRecord><transactionRecord><age>10</age><amount>10000.0</amount><postCode>430222</postCode><transactionDate>2015-10-31 00:00:00</transactionDate><userId>1234</userId><username>sammy</username></transactionRecord><transactionRecord><age>10</age><amount>12321.0</amount><postCode>430222</postCode><transactionDate>2015-12-03 00:00:00</transactionDate><userId>9999</userId><username>john</username></transactionRecord></transactionRecord>
diff --git a/spring-batch/xml/retryOutput.xml b/spring-batch/xml/retryOutput.xml
index 57b0e27254..d30f2c4a32 100644
--- a/spring-batch/xml/retryOutput.xml
+++ b/spring-batch/xml/retryOutput.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><transactionRecord><transactionRecord><age>10</age><amount>10000.0</amount><postCode>430222</postCode><transactionDate>2015-10-31 00:00:00</transactionDate><userId>1234</userId><username>sammy</username></transactionRecord><transactionRecord><age>10</age><amount>12321.0</amount><postCode>430222</postCode><transactionDate>2015-12-03 00:00:00</transactionDate><userId>2134</userId><username>john</username></transactionRecord></transactionRecord>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><transactionRecord><transactionRecord><age>10</age><amount>10000.0</amount><postCode>430222</postCode><transactionDate>2015-10-31 00:00:00</transactionDate><userId>1234</userId><username>sammy</username></transactionRecord><transactionRecord><age>10</age><amount>12321.0</amount><postCode>430222</postCode><transactionDate>2015-12-03 00:00:00</transactionDate><userId>9999</userId><username>john</username></transactionRecord></transactionRecord>
\ No newline at end of file