Fix merge conflicts
authorAndrey Mokhov <andrey.mokhov@gmail.com>
Wed, 16 Aug 2017 02:47:39 +0000 (03:47 +0100)
committerAndrey Mokhov <andrey.mokhov@gmail.com>
Wed, 16 Aug 2017 02:47:39 +0000 (03:47 +0100)
1  2 
src/Rules.hs
src/Rules/Program.hs

diff --cc src/Rules.hs
Simple merge
Simple merge