Skip to content
Snippets Groups Projects
Commit d5cfa59e authored by Morris Jette's avatar Morris Jette
Browse files

Correction to bad merge 

The merge from v2.6 to master in commit 18985643
seems to have gone horribly wrong. This should fix it.
parent 69680e47
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 7 deletions
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
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung