[#4123] Removed duplicate test from merge conflicts
Signed-off-by: Cory Johns johnsca@geek.net
Authored by: Cory Johns 2012-05-10
Parent(s): [8ba72f]
Child(ren): [0c4285]