User: oj Date: 2007-08-03 10:35:07+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
Log: remove merge conflict File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/spreadsheet/ ================================================================================= File [changed]: SpreadsheetRawReportProcessor.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java?r1=1.2&r2=1.3 Delta lines: +3 -11 -------------------- --- SpreadsheetRawReportProcessor.java 2007-07-09 11:56:07+0000 1.2 +++ SpreadsheetRawReportProcessor.java 2007-08-03 10:35:05+0000 1.3 @@ -4,17 +4,9 @@ * * $RCSfile: SpreadsheetRawReportProcessor.java,v $ * -<<<<<<< SpreadsheetRawReportProcessor.java - * $Revision: 1.2 $ -======= - * $Revision: 1.2 $ ->>>>>>> 1.1.2.3 - * -<<<<<<< SpreadsheetRawReportProcessor.java - * last change: $Author: rt $ $Date: 2007/07/09 11:56:07 $ -======= - * last change: $Author: rt $ $Date: 2007/07/09 11:56:07 $ ->>>>>>> 1.1.2.3 + * $Revision: 1.3 $ + * + * last change: $Author: oj $ $Date: 2007/08/03 10:35:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
