[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.14rc1-25-g452f006

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  452f006abdfedd6eecaa9c0a76ee91d833433549 (commit)
      from  63341f6e643173454c0050ff534785ed74c11863 (commit)

Summary of changes:
 docs/UPGRADING-4.0 | 1 -
 1 file changed, 1 deletion(-)

- Log -----------------------------------------------------------------
commit 452f006abdfedd6eecaa9c0a76ee91d833433549
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Jul 25 12:08:18 2013 -0400

    Remove trailing conflict marker which slipped in

diff --git a/docs/UPGRADING-4.0 b/docs/UPGRADING-4.0
index deb8bac..63dd2ee 100644
--- a/docs/UPGRADING-4.0
+++ b/docs/UPGRADING-4.0
@@ -246,4 +246,3 @@ upgrade by running:
 
 Followed by re-running make upgrade-database and answering 3.9.8 when
 prompted for which RT version you're upgrading from.
->>>>>>> 4.0/pg-9.2-compatibility

-----------------------------------------------------------------------