[Pocolap-cvscommit] pocolap/userdocs/sampledata/pocolapDB/crosstabdefs derbyconfig.xml,1.9,1.10

[Rashmi B. <ra...@us...>]

Update of /cvsroot/pocolap/pocolap/userdocs/sampledata/pocolapDB/crosstabdefs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29022

Modified Files:
	derbyconfig.xml 
Log Message:
Conflict Resolution

Index: derbyconfig.xml
===================================================================
RCS file: /cvsroot/pocolap/pocolap/userdocs/sampledata/pocolapDB/crosstabdefs/derbyconfig.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** derbyconfig.xml	18 Mar 2005 23:28:23 -0000	1.9
--- derbyconfig.xml	19 Mar 2005 01:15:36 -0000	1.10
***************
*** 57,60 ****
--- 57,62 ----
      </dimension>
      <supplemental>
+       <reporticon src="pocologo_tiny.jpg" alt="The pocOLAP logo" 
+       	height="75" width="75" top="10" left="10" />
        <description>This shows data stored in a Derby database</description>
        <link linktext="Learn more at the pocOLAP home page" linkurl="http://pocolap.sourceforge.net" />
***************
*** 80,84 ****
                    <excludeMatchList/>           
                    <matchStrings/>
!                   <excludeMatchStrings/> 
                    <greaterThan>Barkley</greaterThan>
                    <lessThan>Weston</lessThan> 
--- 82,86 ----
                    <excludeMatchList/>           
                    <matchStrings/>
!                   <excludeMatchStrings/>    
                    <greaterThan>Barkley</greaterThan>
                    <lessThan>Weston</lessThan> 
***************
*** 93,98 ****
                    <greaterThan>2.0</greaterThan>
                    <lessThan>10.0</lessThan> 
!                   <combineWithAnd/> 
!                   <range/>
                </field>
            </table>
--- 95,99 ----
                    <greaterThan>2.0</greaterThan>
                    <lessThan>10.0</lessThan> 
!                   <combineWithAnd/>                   
                </field>
            </table>
***************
*** 105,110 ****
                    <greaterThan/>
                    <lessThan/> 
!                   <combineWithAnd/> 
!                   <range/>
                </field>
            </table>
--- 106,110 ----
                    <greaterThan/>
                    <lessThan/> 
!                   <combineWithAnd/>                   
                </field>
            </table>
***************
*** 123,126 ****
      </filter>
    </savedreport>
-    
  </crosstab>
\ No newline at end of file
--- 123,125 ----