1 files changed, 1 insertions, 1 deletions

diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/conflict/Conflict.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/conflict/Conflict.java
index 0dc9603bc60..119680026c9 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/conflict/Conflict.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/conflict/Conflict.java
@@ -53,7 +53,7 @@ public final class Conflict implements IOseeStorable {
    public long getId() {
       return itemId;
    }
-   
+
    public MergeBranch getMergeBranch() {
       return mergeBranch;
    }