github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-11-28 01:47:01 +03:00
Code Issues Projects Releases Wiki Activity

Merge fallout.

Browse Source
This commit is contained in:
Patrick Thomson 2020-01-29 12:32:53 -05:00
parent ce0f4335e1
commit a53495d3b4
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Data/Project.hs
View File

@ -13,6 +13,7 @@ import Control.Monad.IO.Class
import Data.Blob
import Data.Blob.IO
import Data.Language
import Data.Semilattice.Lower
import Data.Text (Text)
import qualified Data.Text as T
import Semantic.IO

4
src/Semantic/Graph.hs
View File

@ -71,12 +71,8 @@ import Data.Functor.Foldable
import Data.Graph
import Data.Graph.ControlFlowVertex (VertexDeclaration)
import Data.Language as Language
<<<<<<< HEAD
import Data.List (find, isPrefixOf, isSuffixOf)
import Data.Map (Map)
=======
import Data.List (isPrefixOf)
>>>>>>> origin/master
import qualified Data.Map as Map
import Data.Project
import Data.Proxy