-
Notifications
You must be signed in to change notification settings - Fork 66
⚠️ CONFLICT! Lineage pull request for: skeleton #17
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
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
7d7a677
Updated pre-commit configuration with 'pre-commit autoupdate'.
mcdonnnj ce6658a
Update isort pre-commit hook source repository.
mcdonnnj daaebc1
Ran pre-commit autoupdate.
mcdonnnj 2399f24
Remove legacy comment from the isort hook declaration.
mcdonnnj fe4d5eb
Disable the terraform_validate hook.
mcdonnnj 4d4db07
Merge branch 'develop' into improvements/pre-commit_autoupdate_2020-05
mcdonnnj f831ef8
Add final statement to descriptionf or why terraform_validate is disa…
mcdonnnj 64edcc2
Merge branch 'improvements/pre-commit_autoupdate_2020-05' of github.c…
mcdonnnj 70f0cbd
Merge pull request #44 from cisagov/improvements/pre-commit_autoupdat…
mcdonnnj 89fdba5
Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton
d1c283e
Resolve merge conflicts.
felddy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.