merged in phadej edits

ucsd-progsys · Jul 31, 2018 · b4def39 · b4def39
1 parent 200d297
commit b4def39
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/TODO.md b/TODO.md
@@ -23,7 +23,7 @@
 - [x] alias
 - [x] importing
 - [x] measures
-- [-] importing
+- [x] importing
 - [ ] invariants
 - [ ] importing
 - [ ] termination

diff --git a/liquid-fixpoint b/liquid-fixpoint
diff --git a/stack.yaml b/stack.yaml
@@ -1,5 +1,4 @@
-
-resolver: nightly-2018-06-27
+resolver: lts-12.2
 
 packages:
 - liquid-fixpoint/
@@ -12,8 +11,7 @@ extra-deps:
 - intern-0.9.2
 - located-base-0.1.1.1
 - tasty-rerun-1.1.12
-- git: https://github.com/deepfire/text-format.git
-  commit: a1cda87c222d422816f956c7272e752ea12dbe19
+- text-format-0.3.2
 
 flags:
   liquidhaskell: