Merge branch 'master' of https://github.com/haslab/Electrum

haslab · May 21, 2018 · d9bd214 · d9bd214
2 parents bcc3991 + aeb1007
commit d9bd214
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "lib/Pardinus"]
 	path = pardinus
 	url = https://github.com/nmacedo/Pardinus
-	branch = v1.0
+	branch = master
diff --git a/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4Options.java b/electrum/src/main/java/edu/mit/csail/sdg/alloy4compiler/translator/A4Options.java
@@ -122,10 +122,10 @@ public static SatSolver parse(String id) {
         public static final SatSolver KK = new SatSolver("kodkod", "Output Kodkod to file", null, null, true);
         /** Electrod through NuSMV */
         // [HASLab]
-        public static final SatSolver ElectrodS = new SatSolver("electrodS", "Electrod/NuSMV", null, null, true);
+		public static final SatSolver ElectrodS = new SatSolver("electrodS", "Electrod_NuSMV", null, null, true);
         /** Electrod through nuXmv */
         // [HASLab]
-        public static final SatSolver ElectrodX = new SatSolver("electrodX", "Electrod/nuXmv", null, null, true);
+        public static final SatSolver ElectrodX = new SatSolver("electrodX", "Electrod_nuXmv", null, null, true);
     }
 
     /** This ensures the class can be serialized reliably. */