From 87d37786da51486ad2f2b32cc4eec04c916346cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Blanc?= <regwblanc@gmail.com>
Date: Wed, 18 Apr 2012 14:42:56 +0200
Subject: [PATCH] oups, forgot this conflict resolution
---
src/main/scala/leon/plugin/LeonPlugin.scala | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/main/scala/leon/plugin/LeonPlugin.scala b/src/main/scala/leon/plugin/LeonPlugin.scala
index 0db7fa99c..3654de04a 100644
--- a/src/main/scala/leon/plugin/LeonPlugin.scala
+++ b/src/main/scala/leon/plugin/LeonPlugin.scala
@@ -64,11 +64,8 @@ class LeonPlugin(val global: Global, val actionAfterExtraction : Option[Program=
case "quickcheck" => leon.Settings.useQuickCheck = true
case "parallel" => leon.Settings.useParallel = true
case "noLuckyTests" => leon.Settings.luckyTest = false
-<<<<<<< HEAD
case "noverifymodel" => leon.Settings.verifyModel = false
-=======
case "verbose" => leon.Settings.verbose = true
->>>>>>> leon2
case s if s.startsWith("unrolling=") => leon.Settings.unrollingLevel = try { s.substring("unrolling=".length, s.length).toInt } catch { case _ => 0 }
case s if s.startsWith("functions=") => leon.Settings.functionsToAnalyse = Set(splitList(s.substring("functions=".length, s.length)): _*)
case s if s.startsWith("extensions=") => leon.Settings.extensionNames = splitList(s.substring("extensions=".length, s.length))
--
GitLab