[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq] Branch 'release/jon3.1.x' - modules/plugins
From:       snegrea () fedoraproject ! org (snegrea)
Date:       2012-07-30 22:01:34
Message-ID: 20120730220134.8DAA5F0F () fedorahosted ! org
[Download RAW message or body]

 modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1095d809d84c44a8daf5e875ec4f7080e1b30239
Author: Stefan Negrea <snegrea at redhat.com>
Date:   Mon Jul 30 17:01:22 2012 -0500

    Fix a merge error that introduced unnecessary characters.

diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml \
b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index \
                f42b583..34616c2 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -769,7 +769,6 @@
       </resource-configuration>
 '>
 
-=======
     <!ENTITY loginModuleResourceConfig '
       <resource-configuration>
              <c:simple-property name="code" required="true" type="string" \
readOnly="true"


[prev in list] [next in list] [prev in thread] [next in thread]