Changed start-date to start_date
svn: r12770
This commit is contained in:
parent
1bbb5d6996
commit
6aaa3b9136
@ -432,7 +432,7 @@ class Merge(Tool.Tool,ManagedWindow.ManagedWindow):
|
|||||||
if start_date_2 <= start_date_1 <= stop_date_2 or \
|
if start_date_2 <= start_date_1 <= stop_date_2 or \
|
||||||
start_date_1 <= start_date_2 <= stop_date_1 or \
|
start_date_1 <= start_date_2 <= stop_date_1 or \
|
||||||
start_date_2 <= stop_date_1 <= stop_date_2 or \
|
start_date_2 <= stop_date_1 <= stop_date_2 or \
|
||||||
start-date_1 <= stop_date_2 <= stop_date_1:
|
start_date_1 <= stop_date_2 <= stop_date_1:
|
||||||
return 0.5
|
return 0.5
|
||||||
else:
|
else:
|
||||||
return -1
|
return -1
|
||||||
|
Loading…
Reference in New Issue
Block a user