Author: jdonnerstag
Date: Thu Sep 17 20:23:55 2009
New Revision: 816371
URL: http://svn.apache.org/viewvc?rev=816371&view=rev
Log:
removed left over merge conflict
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java?rev=816371&r1=816370&r2=816371&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/Markup.java Thu
Sep 17 20:23:55 2009
@@ -106,13 +106,9 @@
/**
* @see MarkupResourceStream#locationAsString()
-<<<<<<< HEAD:wicket/src/main/java/org/apache/wicket/markup/Markup.java
- * @return Markup Resource Stream location as string
-=======
* @see IFixedLocationResourceStream#locationAsString()
*
* @return The fixed location as a string, e.g. the file name or the URL
->>>>>>> found a bug. Unfortunately it is not yet working
correctly.:wicket/src/main/java/org/apache/wicket/markup/Markup.java
*/
public String locationAsString()
{
@@ -324,15 +320,9 @@
}
/**
-<<<<<<< HEAD:wicket/src/main/java/org/apache/wicket/markup/Markup.java
- * Compare two Markups
*
* @param that
* @return true, if equal
-=======
- *
- * @see org.apache.wicket.markup.IMarkupFragment#find(java.lang.String,
java.lang.String, int)
->>>>>>> found a bug. Unfortunately it is not yet working
correctly.:wicket/src/main/java/org/apache/wicket/markup/Markup.java
*/
public final IMarkupFragment find(final String path, final String id,
final int startIndex)
{
