fixed merge issues 7
authorTimofeev Sergey <setimofe@it-w3007.(none)>
Wed, 8 Dec 2010 15:35:55 +0000 (18:35 +0300)
committerTimofeev Sergey <setimofe@it-w3007.(none)>
Wed, 8 Dec 2010 15:35:55 +0000 (18:35 +0300)
commit8fd02f1ade833deba9aa5c53af82287c7c2d1543
tree0f6005ee7222fa6fdb9addb83c2c6ce27515ccd0
parent1702b79f2cfb1e434d9ecd6f1b79e7b4e7d3ac82
fixed merge issues
hudson/src/main/java/hudson/plugins/meegofft/MeegoFastFeedback.java