You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openaz.apache.org by co...@apache.org on 2015/07/13 18:14:42 UTC
incubator-openaz git commit: Removing HEAD comment
Repository: incubator-openaz
Updated Branches:
refs/heads/master e1de8ff40 -> 7fc92f796
Removing HEAD comment
Project: http://git-wip-us.apache.org/repos/asf/incubator-openaz/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-openaz/commit/7fc92f79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-openaz/tree/7fc92f79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-openaz/diff/7fc92f79
Branch: refs/heads/master
Commit: 7fc92f796d2b43d60c8355e82a9188a09c3ffb00
Parents: e1de8ff
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jul 13 17:14:32 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jul 13 17:14:32 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/openaz/xacml/std/StdMutableRequest.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/7fc92f79/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 @@ public class StdMutableRequest implements Request {
}
/**
-<<<<<<< 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>.
*/