Skip to content
Commit 1c5647c8 authored by Peter Simons's avatar Peter Simons
Browse files

Merge pull request #1716 from ocharles/haskellPackages.diff3 

haskellPackages.diff3: New expression
parents 8e9f6199 cf5513f2
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment