Skip to content

Commit

Permalink
Handle 'project' name collision
Browse files Browse the repository at this point in the history
  • Loading branch information
bergey committed Jan 24, 2014
1 parent d262925 commit 4b1aca9
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/Diagrams/Prelude.hs
Expand Up @@ -147,5 +147,5 @@ import Data.AffineSpace
import Data.Colour hiding (AffineSpace (..), atop, over)
import Data.Colour.Names hiding (tan)
import Data.Semigroup
import Data.VectorSpace hiding (Sum (..))
import Data.VectorSpace hiding (Sum (..), project)
import Control.Lens ((&), (.~), (%~))
2 changes: 1 addition & 1 deletion src/Diagrams/ThreeD/Transform.hs
Expand Up @@ -18,7 +18,7 @@

module Diagrams.ThreeD.Transform where

import Diagrams.Core
import Diagrams.Core hiding (project)
import qualified Diagrams.Core.Transform as T

import Diagrams.ThreeD.Types
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/ThreeD/Types.hs
Expand Up @@ -47,7 +47,7 @@ import Diagrams.Coordinates
import Data.AffineSpace.Point
import Data.Basis
import Data.Cross
import Data.VectorSpace
import Data.VectorSpace hiding (project)

------------------------------------------------------------
-- 3D Euclidean space
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/TwoD/Polygons.hs
Expand Up @@ -61,7 +61,7 @@ import Data.Default.Class
import Data.VectorSpace (magnitude, normalized, project, (<.>),
(^*))

import Diagrams.Core
import Diagrams.Core hiding (project)
import Diagrams.Located
import Diagrams.Path
import Diagrams.Points (centroid)
Expand Down
2 changes: 1 addition & 1 deletion src/Diagrams/TwoD/Types.hs
Expand Up @@ -42,7 +42,7 @@ import Data.AffineSpace.Point
import Data.Basis
import Data.MemoTrie (HasTrie (..))
import Data.NumInstances.Tuple ()
import Data.VectorSpace
import Data.VectorSpace hiding (project)

import Data.Typeable
------------------------------------------------------------
Expand Down

0 comments on commit 4b1aca9

Please sign in to comment.