diff options
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java index 6ca8bf49..9ab142c8 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java +++ b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java @@ -8,6 +8,7 @@ import com.zeapo.pwdstore.R; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.PullCommand; +import org.eclipse.jgit.merge.MergeStrategy; import java.io.File; |