diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/demo/Database/library/build.xml | 4 | ||||
| -rw-r--r-- | java/demo/Database/library/config.client | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/java/demo/Database/library/build.xml b/java/demo/Database/library/build.xml index 5d894d4610c..915b235a438 100644 --- a/java/demo/Database/library/build.xml +++ b/java/demo/Database/library/build.xml @@ -1,11 +1,7 @@ <!-- ********************************************************************** -<<<<<<< HEAD:java/demo/Database/library/build.xml Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved. -======= - Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. ->>>>>>> origin/R3_3_branch:java/demo/Database/library/build.xml This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/java/demo/Database/library/config.client b/java/demo/Database/library/config.client index ca71c17ee16..978ddf615e7 100644 --- a/java/demo/Database/library/config.client +++ b/java/demo/Database/library/config.client @@ -25,11 +25,7 @@ Ice.RetryIntervals=-1 # # Warn about connection exceptions # -<<<<<<< HEAD:java/demo/Database/library/config.client -Ice.Warn.Connections=1 -======= #Ice.Warn.Connections=1 ->>>>>>> origin/R3_3_branch:java/demo/Database/library/config.client # # Network Tracing |