[Lucene-java Wiki] Trivial Update of "PoweredBy" by KarlWettin

[Apache Wiki <wi...@apache.org>]

Dear Wiki user,

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

The "PoweredBy" page has been changed by KarlWettin.
The comment on this change is: Removed a conflict message someone manage to push in.
http://wiki.apache.org/lucene-java/PoweredBy?action=diff&rev1=535&rev2=536

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

   * [[http://limax.tigris.org|Limax]] ORM using Lucene as primary persistence.
   * [[http://www.linguatools.de|Linguatools]] - online search in a large translation archive (german <-> english, german <-> czech)
   * [[http://www.profischnell.com|Übersetzung Deutsch Englisch]] - translation agency for all languages
- 
- ---- /!\ '''Edit conflict - other version:''' ----
-  * [[http://www.profischnell.com|Übersetzung Deutsch Englisch]] - translation agency for all languages
- 
- ---- /!\ '''Edit conflict - your version:''' ----
- 
- ---- /!\ '''End of edit conflict''' ----
   * [[http://demo.lingway.com/lkm|Lingway KM]] multilingual and semantic search solution
   * [[http://www.inf.ed.ac.uk/publications/thesis/online/IM040258.pdf|LiQED]] - University of Edinburgh's QED Question Answering module for list questions
   * [[http://www.linkedin.com/|LinkedIn]]