Commit 514b80b

committed

fix tabs vs spaces in merged code segment

reported by Piotr.Lewczuk@uk-erlangen.de

1 parent 6e0d241 commit 514b80bCopy full SHA for 514b80b

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -255,8 +255,8 @@ def __init__(self, totalWeight, totalVolume, totalValue):`
`255`	`255`	`def __gt__(self, other):`
`256`	`256`	`if self.TotalValue != other.TotalValue:`
`257`	`257`	`return self.TotalValue > other.TotalValue`
`258`		`-if self.TotalWeight != other.TotalWeight:`
`259`		`-return self.TotalWeight < other.TotalWeight`
	`258`	`+if self.TotalWeight != other.TotalWeight:`
	`259`	`+return self.TotalWeight < other.TotalWeight`
`260`	`260`	`return self.TotalValue < other.TotalValue`
`261`	`261`
`262`	`262`	`def __str__(self):`

Comments

(0)