Fix another badly-resolved conflict.
authorMurray Cumming <murrayc@murrayc.com>
Tue, 24 Jan 2012 20:14:58 +0000 (21:14 +0100)
committerMurray Cumming <murrayc@murrayc.com>
Tue, 24 Jan 2012 20:14:58 +0000 (21:14 +0100)
commit001ed8e3fe54c32ea80ffc49efde449b3e31050e
treee244abbfe95362925282fb322345153955349fa5
parentc8293bc43b28846d117cdb297de19f2071b39cea
Fix another badly-resolved conflict.
src/main/java/org/glom/web/client/ui/TableSelectionViewImpl.java