commit 7fc92f796d2b43d60c8355e82a9188a09c3ffb00
author Colm O hEigeartaigh <coheigea@apache.org> Mon Jul 13 17:14:32 2015 +0100
committer Colm O hEigeartaigh <coheigea@apache.org> Mon Jul 13 17:14:32 2015 +0100
tree c01fda19c4da369234de3c98c2f2c837a87f999a
parent e1de8ff40b4a3e435ca5e6e17cc841aa8e18720d

Removing HEAD comment

openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequest.java

diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequest.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequest.java
index 9f43565..09a926f 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequest.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequest.java
@@ -418,12 +418,7 @@
     }
 
     /**
-<<<<<<< HEAD:openaz-xacml/src/main/java/org/apache/openaz/xacml/std/StdMutableRequest.java
      * Sets the {@link org.apache.openaz.xacml.api.Status} indicating the validity of this <code>StdMutableRequest</code>.
-=======
-     * Sets the {@link org.apache.openaz.xacml.api.Status} indicating the validity of this
-     * <code>StdMutableRequest</code>.
->>>>>>> fbf04a9381a2cdc18cbbe04bdc63b86b9772f14b:openaz-xacml/src/main/java/com/att/research/xacml/std/StdMutableRequest.java
      *
      * @param statusIn the <code>Status</code> for this <code>StdMutableRequest</code>.
      */