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

OSOE-91: Normalize line endings to auto across all submodules #67

Merged
merged 10 commits into from
Apr 23, 2022

Conversation

sarahelsaig
Copy link
Member

# Conflicts:
#	Extensions/CodeGeneration/CodeGenerationDisplayDriver.cs
#	Extensions/Flows/Drivers/AdditionalStylingPartDisplay.cs
#	Extensions/Security/Driver/StrictSecuritySettingsDisplayDriver.cs
# Conflicts:
#	Lombiq.HelpfulExtensions.csproj
# Conflicts:
#	Lombiq.HelpfulExtensions.csproj
#	Manifest.cs
sarahelsaig and others added 3 commits April 21, 2022 15:37
# Conflicts:
#	Models/BootstrapAccordionItem.cs
#	Readme.md
#	Views/BootstrapAccordion.cshtml
.gitignore Outdated Show resolved Hide resolved
Views/AdditionalStylingPart.Edit.cshtml Outdated Show resolved Hide resolved
@0liver 0liver merged commit cce3284 into dev Apr 23, 2022
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.

2 participants