[FIxed conflict in docs.
bringert@cs.chalmers.se**20050901112647] {
hunk ./doc/gf-java.html 172
-href="http://www.cs.chalmers.se/~bringert/darcs/simpledemo/src/SimpleDemoText.java">SimpleDemoText.java.
+href="http://www.cs.chalmers.se/~bringert/darcs/simpledemo/src/SimpleDemoText.java">SimpleDemoText.java. This examples uses
+these grammars. There is a Darcs repo for the complete demo program.
}