Skip to content

Ignore indentation changes in blame history#6418

Merged
jcfr merged 1 commit intoSlicer:masterfrom
jamesobutler:vtk8-drop-followup
Jun 8, 2022
Merged

Ignore indentation changes in blame history#6418
jcfr merged 1 commit intoSlicer:masterfrom
jamesobutler:vtk8-drop-followup

Conversation

@jamesobutler
Copy link
Contributor

This should resolve the configuration error that happened on macOS https://slicer.cdash.org/viewBuildError.php?buildid=2709158.

The "endif" portion was not removed when it should have been as part of changes in b9ac6ed.

@jamesobutler jamesobutler requested a review from jcfr June 8, 2022 14:46
@jcfr jcfr force-pushed the vtk8-drop-followup branch from 6e90909 to 8d5c18e Compare June 8, 2022 18:03
@jcfr jcfr force-pushed the vtk8-drop-followup branch from 8d5c18e to 552be8c Compare June 8, 2022 18:05
@jcfr
Copy link
Member

jcfr commented Jun 8, 2022

First commit originally introduced in this pull request (463d36b) has been superseded by #6419

It was then forced pushed to only include STYLE: Ignore indentation changes in blame history

@jcfr jcfr changed the title BUG: Fix configuration error on macOS due to improper flow control Ignore indentation changes in blame history Jun 8, 2022
@jcfr jcfr merged commit d24cd5b into Slicer:master Jun 8, 2022
@jamesobutler jamesobutler deleted the vtk8-drop-followup branch June 8, 2022 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants