Skip to content
Commit 0aba9f97 authored by Kohsuke Kawaguchi's avatar Kohsuke Kawaguchi
Browse files

The "ours" merge to avoid unnecesary merge conflict down the road.

parents 4bf8f09b b013c4dd
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