diff options
| author | chriseth <chris@ethereum.org> | 2018-11-26 22:01:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-26 22:01:09 +0800 |
| commit | e7f6ed8f5ce2fccef61d34ad199ab9cc1b281cde (patch) | |
| tree | b9efc799775dcd9ad3c7e4b0b76dbc203fc8de1d | |
| parent | 7cc6738df3d64f9597adc77a84dbfab3888728a1 (diff) | |
| parent | a46d5c65803c7e0cf814d610d8ad87f09f89f2e4 (diff) | |
| download | dexon-solidity-e7f6ed8f5ce2fccef61d34ad199ab9cc1b281cde.tar dexon-solidity-e7f6ed8f5ce2fccef61d34ad199ab9cc1b281cde.tar.gz dexon-solidity-e7f6ed8f5ce2fccef61d34ad199ab9cc1b281cde.tar.bz2 dexon-solidity-e7f6ed8f5ce2fccef61d34ad199ab9cc1b281cde.tar.lz dexon-solidity-e7f6ed8f5ce2fccef61d34ad199ab9cc1b281cde.tar.xz dexon-solidity-e7f6ed8f5ce2fccef61d34ad199ab9cc1b281cde.tar.zst dexon-solidity-e7f6ed8f5ce2fccef61d34ad199ab9cc1b281cde.zip | |
Merge pull request #5506 from ethereum/fixMergeConflict
Fix merge problem in CMake files.
| -rw-r--r-- | liblangutil/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libsolidity/CMakeLists.txt | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/liblangutil/CMakeLists.txt b/liblangutil/CMakeLists.txt index 3d8bd37a..dfcccfce 100644 --- a/liblangutil/CMakeLists.txt +++ b/liblangutil/CMakeLists.txt @@ -5,6 +5,7 @@ set(sources Exceptions.cpp ParserBase.cpp Scanner.cpp + SourceReferenceFormatter.cpp Token.cpp ) diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt index 40996aba..d2e0c854 100644 --- a/libsolidity/CMakeLists.txt +++ b/libsolidity/CMakeLists.txt @@ -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 |