Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tools] Fix path in recreate_conflict #8292

Merged
merged 1 commit into from Jan 12, 2023
Merged

Conversation

driusan
Copy link
Collaborator

@driusan driusan commented Dec 20, 2022

This fixes the wrong path in the require_once for recreate_conflict. It also passes a missing LorisInstance object to the ConflictDetector function.

I still wasn't able to run the script to completion because I don't have instruments that are properly configured on my sandbox for this version of LORIS, but this resolves #8063.

Someone with up to date instruments should test the rest of the script.

This fixes the wrong path in the require_once for recreate_conflict.
It also passes a missing LorisInstance object to the ConflictDetector
function.

I still wasn't able to run the script to completion because I don't
have instruments that are properly configured on my sandbox for this
version of LORIS, but this resolves aces#8063.

Someone with up to date instruments should test the rest of the script.
@driusan driusan merged commit e054e67 into aces:24.1-release Jan 12, 2023
@ridz1208 ridz1208 added this to the 24.1.2 milestone Feb 1, 2023
zaliqarosli pushed a commit to zaliqarosli/Loris that referenced this pull request Mar 6, 2023
This fixes the wrong path in the require_once for recreate_conflict.
It also passes a missing LorisInstance object to the ConflictDetector
function.

Resolves aces#8063.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants