Skip to content
Snippets Groups Projects
Commit e93a8de7 authored by Karim Ahmed's avatar Karim Ahmed
Browse files

remove noise from conflict resoving

parent 1a53b90e
No related branches found
No related tags found
1 merge request!738New calcat interface
This commit is part of merge request !774. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 107 additions and 225 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

Legal Notice | Contacts