# HG changeset patch
# User nipkow
# Date 1545936521 -3600
# Node ID f9bf65d90b698687c596ee35180e53670194ec45
# Parent  04e54f57a8691dacb23d28760b17f50c6d4bf436# Parent  2a4c8a2a3f8e3fa056e386b24b6ff476be9d7ab0
merged

diff -r 2a4c8a2a3f8e -r f9bf65d90b69 etc/settings
--- a/etc/settings	Thu Dec 27 19:48:28 2018 +0100
+++ b/etc/settings	Thu Dec 27 19:48:41 2018 +0100
@@ -153,9 +153,9 @@
 
 ISABELLE_STACK_ROOT="$ISABELLE_HOME_USER/stack"
 
-ISABELLE_STACK_RESOLVER="lts-12.13"
+ISABELLE_STACK_RESOLVER="lts-13.0"
 
-ISABELLE_GHC_VERSION="ghc-8.4.3"
+ISABELLE_GHC_VERSION="ghc-8.6.3"
 
 
 ###
diff -r 2a4c8a2a3f8e -r f9bf65d90b69 src/Pure/General/path.ML
--- a/src/Pure/General/path.ML	Thu Dec 27 19:48:28 2018 +0100
+++ b/src/Pure/General/path.ML	Thu Dec 27 19:48:41 2018 +0100
@@ -239,4 +239,3 @@
 val explode = explode_path;
 
 end;
-