Skip to content
Commit 8843bc59 authored by Richard Schwarting's avatar Richard Schwarting
Browse files

Attr.vala: fix a merge conflict

parents 8bfae8a9 d2a5ab9e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment