levkowetz · levkowetz · commit 557c32eeaa57 · 2014-07-19T17:27:49.000Z
- Legacy-Id: 8126
diff --git a/hold-for-merge b/hold-for-merge
@@ -1,3 +1,4 @@
+personal/hui/v5.6.2-dev0@8119		# incorrect resolution
 personal/liudapeng/v5.5.1-dev0@7925	# alternative resolution desired
 personal/rjs/v5.2.0@7544
 personal/liudapeng/v5.0.2@7399

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+personal/hui/v5.6.2-dev0@8119 # incorrect resolution`
`1`	`2`	`personal/liudapeng/v5.5.1-dev0@7925 # alternative resolution desired`
`2`	`3`	`personal/rjs/v5.2.0@7544`
`3`	`4`	`personal/liudapeng/v5.0.2@7399`