Is there a version of this that works with the latest SVN trunk?
I get:
$ git checkout origin/trunk
$ git pull https://github.com/jorkey/AkWiab.git
CONFLICT (add/add): Merge conflict in README.import
[ lots more conflicts ]
CONFLICT (add/add): Merge conflict in
src/org/waveprotocol/box/waveimport/google/RobotApi.java
Thanks,
On 2012-01-31 14:35, Kirill Kostyuchenko wrote:
Prerelease search functionality published at the fundwiab.com.
Please add this news to incubator.apache.org/wave
I think many people want to see something like this today..
--
Dr Thomas Leonard
IT Innovation Centre
Gamma House, Enterprise Road,
Southampton SO16 7NS, UK
tel: +44 23 8059 8866
mailto:[email protected]
http://www.it-innovation.soton.ac.uk/
