donaldp 02/03/21 07:06:13
Modified: src/java/org/apache/avalon/framework/configuration
Configuration.java
Log:
Okay lets remove the conflict this time.
Note to self. Save your buffers before commiting.
Revision Changes Path
1.16 +0 -7
jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Configuration.java
Index: Configuration.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Configuration.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Configuration.java 21 Mar 2002 14:51:13 -0000 1.15
+++ Configuration.java 21 Mar 2002 15:06:13 -0000 1.16
@@ -286,13 +286,6 @@
* @pre paramName != null
* @post getAttributeAsLong() != null
*
-<<<<<<< Configuration.java
-=======
- * @param name The name of the parameter you ask the value of.
- * @return long value of attribute
- * @exception ConfigurationException If no parameter with that name
exists.
- * or if conversion to
<code>long</code> fails.
->>>>>>> 1.14
*/
long getAttributeAsLong( String name ) throws ConfigurationException;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
