Skip to content
Commit 76415d09 authored by Elvis Angelaccio's avatar Elvis Angelaccio
Browse files

Fix broken merge 

Merge commit 5927ecbd did not pick the
changes in kerfuffle_clirar.json.cmake, because of -Xours.

Fixed by `git checkout Applications/16.08 plugins/clirarplugin/kerfuffle_clirar.json.cmake`
parent 2ed09ee0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment