Resolve conflicts.

hzxie · hzxie · commit 0c782477f1e2 · 2020-12-16T15:15:01.000+08:00
diff --git a/torch_points_kernels/torchpoints.py b/torch_points_kernels/torchpoints.py
@@ -281,3 +281,4 @@ def chamfer_dist(xyz1, xyz2, ignore_zeros=False):
 
     dist1, dist2 = ChamferFunction.apply(xyz1, xyz2)
     return torch.mean(dist1) + torch.mean(dist2)
+

Original file line number	Diff line number	Diff line change
`@@ -281,3 +281,4 @@ def chamfer_dist(xyz1, xyz2, ignore_zeros=False):`
`281`	`281`
`282`	`282`	`dist1, dist2 = ChamferFunction.apply(xyz1, xyz2)`
`283`	`283`	`return torch.mean(dist1) + torch.mean(dist2)`
	`284`	`+`