David Jennes e7c4cf6560 Merge branch 'develop' into feature/file-resources ...

# Conflicts:
#	.swiftpm/xcode/xcshareddata/xcschemes/swiftgen.xcscheme
#	Sources/SwiftGenCLI/templates/files/flat-swift4.stencil
#	Sources/SwiftGenCLI/templates/files/flat-swift5.stencil
#	Sources/SwiftGenCLI/templates/files/structured-swift4.stencil
#	Sources/SwiftGenCLI/templates/files/structured-swift5.stencil
#	Sources/TestUtils/TestsHelper+Context.swift
#	SwiftGen.xcodeproj/project.pbxproj
#	Tests/TemplatesTests/TestsHelper.swift

2021-04-12 04:50:18 +02:00

0 lines

0 B

Plaintext

Raw Permalink Blame History

The file is empty.