From ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 Mon Sep 17 00:00:00 2001
From: "Stephen D. Huston" <shuston@apache.org>
Date: Fri, 21 Oct 2011 01:19:00 +0000
Subject: Undo bad merge from trunk - merged at wrong level.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68
---
 java/maven-settings.xml | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 java/maven-settings.xml

(limited to 'java/maven-settings.xml')

diff --git a/java/maven-settings.xml b/java/maven-settings.xml
deleted file mode 100644
index 985f39b6f1..0000000000
--- a/java/maven-settings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<settings>
-</settings>
-- 
cgit v1.2.1