Merge pull request #5506 from ethereum/fixMergeConflict

Fix merge problem in CMake files.
This commit is contained in:
chriseth
2018-11-26 15:01:09 +01:00
committed by GitHub
2 changed files with 1 additions and 1 deletions
+1
View File
@@ -5,6 +5,7 @@ set(sources
Exceptions.cpp
ParserBase.cpp
Scanner.cpp
SourceReferenceFormatter.cpp
Token.cpp
)
-1
View File
@@ -40,7 +40,6 @@ set(sources
interface/CompilerStack.cpp
interface/GasEstimator.cpp
interface/Natspec.cpp
interface/SourceReferenceFormatter.cpp
interface/StandardCompiler.cpp
interface/Version.cpp
parsing/DocStringParser.cpp