Skip to content
Snippets Groups Projects
Commit ce000d1e authored by Wolfgang Bangerth's avatar Wolfgang Bangerth
Browse files

Remove the residuals of a previous merge conflict. 

From-SVN: r66826
parent 486772b1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 1 deletion
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