Merge pull request #319 from vmarkovtsev/master

Fix merging --devs
src-d · Oct 9, 2019 · a34cfd7 · a34cfd7
2 parents 31c0f92 + d78a9c8
commit a34cfd7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/leaves/devs.go b/leaves/devs.go
@@ -268,7 +268,7 @@ func (devs *DevsAnalysis) MergeResults(r1, r2 interface{}, c1, c2 *core.CommonAn
 	offset1 := int(t01.Sub(t0) / cr1.tickSize)
 	offset2 := int(t02.Sub(t0) / cr2.tickSize)
 
-	merged := DevsResult{}
+	merged := DevsResult{tickSize: cr1.tickSize}
 	var mergedIndex map[string]identity.MergedIndex
 	mergedIndex, merged.reversedPeopleDict = identity.MergeReversedDictsIdentities(
 		cr1.reversedPeopleDict, cr2.reversedPeopleDict)

diff --git a/python/setup.py b/python/setup.py
@@ -22,7 +22,7 @@
     description="Python companion for github.com/src-d/hercules to visualize the results.",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version="10.5.0",
+    version="10.5.1",
     license="Apache-2.0",
     author="source{d}",
     author_email="machine-learning@sourced.tech",