diff options
| author | Sidharth Kapur <sidharthkapur1@gmail.com> | 2016-03-13 15:26:03 -0500 |
|---|---|---|
| committer | Sidharth Kapur <sidharthkapur1@gmail.com> | 2016-03-13 15:26:03 -0500 |
| commit | 1b39d2227606523441d918735d467f73b6cf23cc (patch) | |
| tree | e8885f4e150fb50198e655726d0ea6fb1da67a58 /packages/base/src/Internal/Matrix.hs | |
| parent | 8bdb87764762ef43b186bcc04caa404928df22fa (diff) | |
| parent | 6a0bf038091e453115a3451c040cbe790e770b89 (diff) | |
Merge branch 'master' into matrix_binary
Conflicts:
packages/base/src/Internal/Matrix.hs
Diffstat (limited to 'packages/base/src/Internal/Matrix.hs')
| -rw-r--r-- | packages/base/src/Internal/Matrix.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/base/src/Internal/Matrix.hs b/packages/base/src/Internal/Matrix.hs index f9b02ca..c47c625 100644 --- a/packages/base/src/Internal/Matrix.hs +++ b/packages/base/src/Internal/Matrix.hs | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | {-# LANGUAGE TypeFamilies #-} | 6 | {-# LANGUAGE TypeFamilies #-} |
| 7 | {-# LANGUAGE ViewPatterns #-} | 7 | {-# LANGUAGE ViewPatterns #-} |
| 8 | {-# LANGUAGE DeriveGeneric #-} | 8 | {-# LANGUAGE DeriveGeneric #-} |
| 9 | 9 | {-# LANGUAGE ConstrainedClassMethods #-} | |
| 10 | |||
| 11 | 10 | ||
| 12 | -- | | 11 | -- | |
| 13 | -- Module : Internal.Matrix | 12 | -- Module : Internal.Matrix |