Skip to content

Commit

Permalink
Merge pull request #319 from vmarkovtsev/master
Browse files Browse the repository at this point in the history
Fix merging --devs
  • Loading branch information
vmarkovtsev authored Oct 9, 2019
2 parents 31c0f92 + d78a9c8 commit a34cfd7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion leaves/devs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]",
Expand Down

0 comments on commit a34cfd7

Please sign in to comment.