resolve merge with master
authorEugene Petrenko <eugene.petrenko@gmail.com>
Thu, 14 Jul 2011 11:21:28 +0000 (15:21 +0400)
committerEugene Petrenko <eugene.petrenko@gmail.com>
Thu, 14 Jul 2011 11:21:28 +0000 (15:21 +0400)
1  2 
README

diff --cc README
index c1d6ed0d2e7fa2d83e531e6037566ed7c58ce938,60b79a652de50a70edb71c53f56f3376213f1cb3..6b5915e81994ce2f3e38a40cb6c247ece37fbda3
--- 1/README
--- 2/README
+++ b/README
@@@ -11,5 -11,4 +11,5 @@@ This plugin will be compatible with Tea
  API gaps:\r
   - Reuse ComposideBuildProcess and DelegatingBuildProcess\r
   - Use XmlXppAbstractParser#parse(InputSream)\r
-  - Consider reuseing of Maven build trigger/project models\r
 - - Consider reusing of Maven build trigger/project models
++ - Consider reusing of Maven build trigger/project models\r
 + - Make server-side PluginDescription contain getPluginRoot() to avoid cast to PluginInfo