lib/ruote/exp/merge.rb in ruote-2.1.11 vs lib/ruote/exp/merge.rb in ruote-2.2.0
- old
+ new
@@ -1,7 +1,7 @@
#--
-# Copyright (c) 2005-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2011, 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
@@ -39,10 +39,10 @@
#
# If type is 'isolate', the source fields will be placed in a separte field
# in the target workitem. The name of this field is the child_id of the
# source workitem (a string from '0' to '99999' and beyond)
#
- def merge_workitems (index, target, source, type)
+ def merge_workitems(index, target, source, type)
return source if type == 'override'
if target == nil
case type