Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/Laerdal/Laerdal.Dfu into…
Browse files Browse the repository at this point in the history
… ksidirop/MAN-335-ios-runtime-error-fix-about-you-should-not-call-this-method
  • Loading branch information
ksidirop-laerdal committed May 13, 2024
2 parents a265491 + 22b4530 commit b448cc0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -356,4 +356,8 @@ Output/

**/Jars/*.[JjAa]ar

**/Carthage/Cartfile
**/Carthage/Cartfile

# we dont want to allow any local nuget.configs to be checked in as they can cause issues with the build and/or contain hardcoded API keys with write access to the
# nuget feed and this is something we definitely want to avoid at all costs for obvious reasons such nuget.config files should be remain local to each dev machine
[Nn][Uu][Gg][Ee][Tt].[Cc][Oo][Nn][Ff][Ii][Gg]
1 change: 1 addition & 0 deletions Laerdal.Dfu.sln
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Misc", "_Misc", "{37EBD209
Laerdal.Scripts\Laerdal.CreateNewReleaseInGithub.sh = Laerdal.Scripts\Laerdal.CreateNewReleaseInGithub.sh
Laerdal.Scripts\Laerdal.SetupBuildEnvironment.sh = Laerdal.Scripts\Laerdal.SetupBuildEnvironment.sh
.github\workflows\github-actions.yml = .github\workflows\github-actions.yml
.gitignore = .gitignore
EndProjectSection
EndProject
Global
Expand Down

0 comments on commit b448cc0

Please sign in to comment.