Skip to content
Snippets Groups Projects
Commit 3bfaf196 authored by Savici, Andrei T.'s avatar Savici, Andrei T.
Browse files

Resolve conflicts. Refs #12661 

Merge branch '12661_systemtest_pylint' of github.com:mantidproject/mantid into 12661_systemtest_pylint

Conflicts:
	Code/Mantid/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py
parents 46f16aa1 82be283b
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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