cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5506 from ethereum/fixMergeConflict

Browse Source 
Fix merge problem in CMake files.
This commit is contained in:
chriseth 2018-11-26 15:01:09 +01:00 committed by GitHub
commit e7f6ed8f5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
liblangutil/CMakeLists.txt
View File

@ -5,6 +5,7 @@ set(sources
Exceptions.cpp Exceptions.cpp
ParserBase.cpp ParserBase.cpp
Scanner.cpp Scanner.cpp
SourceReferenceFormatter.cpp
Token.cpp Token.cpp
) )

1
libsolidity/CMakeLists.txt
View File

@ -40,7 +40,6 @@ set(sources
interface/CompilerStack.cpp interface/CompilerStack.cpp
interface/GasEstimator.cpp interface/GasEstimator.cpp
interface/Natspec.cpp interface/Natspec.cpp
interface/SourceReferenceFormatter.cpp
interface/StandardCompiler.cpp interface/StandardCompiler.cpp
interface/Version.cpp interface/Version.cpp
parsing/DocStringParser.cpp parsing/DocStringParser.cpp