Commit a6178c22 authored by James Dullaghan's avatar James Dullaghan
Browse files

Fix merge conflict in application.html

parents f8426c72 d18bd8bd
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment