mirror of
				https://github.com/ethereum/solidity
				synced 2023-10-03 13:03:40 +00:00 
			
		
		
		
	Fix merge problem in CMake files.
This commit is contained in:
		
							parent
							
								
									d00082f12f
								
							
						
					
					
						commit
						a46d5c6580
					
				| @ -5,6 +5,7 @@ set(sources | |||||||
| 	Exceptions.cpp | 	Exceptions.cpp | ||||||
| 	ParserBase.cpp | 	ParserBase.cpp | ||||||
| 	Scanner.cpp | 	Scanner.cpp | ||||||
|  | 	SourceReferenceFormatter.cpp | ||||||
| 	Token.cpp | 	Token.cpp | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -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 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user