Skip to content

Commit

Permalink
Resolve conflict again
Browse files Browse the repository at this point in the history
  • Loading branch information
motxx committed Jul 14, 2017
1 parent 0666927 commit 6cc6d5f
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion irohad/main/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ target_link_libraries(irohad
ordering_service
consensus_service
chain_validator
stateful_validator
hash
stateless_validator
client_processor
Expand Down

0 comments on commit 6cc6d5f

Please sign in to comment.