[Kst] Commit problem

[Barth Netterfield]

cbn at elrond kst $ svn commit
svn: Commit failed (details follow):
svn: Aborting commit: 
'/home/cbn/programs/kst/graphics/kst/kst/kstviewlegend.cpp' remains in 
conflict
cbn at elrond kst $ svn up
At revision 479007.
cbn at elrond kst $ svn commit
svn: Commit failed (details follow):
svn: Aborting commit: 
'/home/cbn/programs/kst/graphics/kst/kst/kstviewlegend.cpp' remains in 
conflict
cbn at elrond kst $ 

ideas?

cbn