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)
commit1ade88547a2c3256c6b6e6de8c546a04dc1ae1d3
tree3c70d89bf271bba5b3d0361625f770e3b7111ee1
parent9b70568615e2763ff782279be28286373b59d8ff
parent0c67f7d21536a4ca305758516bce7ccd0f40db7b
Fix merge conflicts
src/Rules.hs
src/Rules/Program.hs