User: kz Date: 2008-06-25 14:06:51+0000 Modified: dba/dbaccess/source/ui/browser/genericcontroller.cxx
Log: #i10000# conflicts fixed File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.91&r2=1.92 Delta lines: +0 -3 ------------------- --- genericcontroller.cxx 2008-06-25 14:02:57+0000 1.91 +++ genericcontroller.cxx 2008-06-25 14:06:48+0000 1.92 @@ -130,11 +130,8 @@ #endif #include <algorithm> #include <hash_map> -<<<<<<< genericcontroller.cxx #include <cppuhelper/implbase1.hxx> -======= #include <limits> ->>>>>>> 1.88.6.6 using namespace ::com::sun::star; using namespace ::com::sun::star::uno; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
