summaryrefslogtreecommitdiff
path: root/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java
diff options
context:
space:
mode:
Diffstat (limited to 'subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java')
-rw-r--r--subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java
index c992d49..5e3c9d0 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java
@@ -42,7 +42,7 @@ public class ConflictResult
private String mergedPath;
/**
- * Create a new conflict result instace.
+ * Create a new conflict result instance.
*/
public ConflictResult(Choice choice, String mergedPath)
{