fe_restore.rb in ruote-2.3.0.2

- old
+ new

@@ -1,7 +1,7 @@
 #--
-# Copyright (c) 2005-2012, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
@@ -21,13 +21,10 @@
 #
 # Made in Japan.
 #++
 
 
-require 'ruote/exp/merge'
-
-
 module Ruote::Exp
 
   #
   # Restores the fields of the current workitem. That means usually copying
   # them from a saved version in a variable or in a separate field.
@@ -52,12 +49,9 @@
   #       participant :ref => 'invoincing'
   #     end
   #   end
   #
   class RestoreExpression < FlowExpression
-
-    include MergeMixin
-      # still have to implement something about merge...
 
     names :restore, :set_fields
 
     def apply
 