Skip to content
Snippets Groups Projects
Commit e89d1b67 authored by rachelmoan's avatar rachelmoan
Browse files

Removing resolve_conflicts function from main policy. Just call a conflict resolver instead.

parent 5e827b31
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment