[#4123] Removed duplicate test from merge conflicts

Signed-off-by: Cory Johns johnsca@geek.net

Cory Johns Cory Johns 2012-05-10

changed Allura/allura/tests/functional/test_neighborhood.py
Allura/allura/tests/functional/test_neighborhood.py Diff Switch to side-by-side view
Loading...