couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Couchdb Wiki] Update of "AndroidReleasePatch" by MattAdams
Date Wed, 02 Feb 2011 23:21:37 GMT
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Couchdb Wiki" for change notification.

The "AndroidReleasePatch" page has been changed by MattAdams.
http://wiki.apache.org/couchdb/AndroidReleasePatch?action=diff&rev1=2&rev2=3

--------------------------------------------------

  For use with [[Installing_on_Android]]
  
  {{{
+ 
+ ---- /!\ '''Edit conflict - other version:''' ----
  diff -ru release-2011-01-26_22-07-58.bak/data/data/com.radicaldynamic.groupinform/erlang/bin/erl
release-2011-01-26_22-07-58/data/data/com.radicaldynamic.groupinform/erlang/bin/erl
  --- release-2011-01-26_22-07-58.bak/data/data/com.radicaldynamic.groupinform/erlang/bin/erl
2011-01-26 22:08:02.000000000 -0700
  +++ release-2011-01-26_22-07-58/data/data/com.radicaldynamic.groupinform/erlang/bin/erl
2011-01-26 22:39:33.000000000 -0700
@@ -45, +47 @@

    # use this file except in compliance with the License. You may obtain a copy of
  }}}
  
+ ---- /!\ '''Edit conflict - your version:''' ----
+ }}}
+ 
+ ---- /!\ '''End of edit conflict''' ----
+ 

Mime
View raw message