diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-04 11:44:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 10:58:42 +0000 |
| commit | 3459ab4a5de1af443a85f66cecc0eeeb6d46df3f (patch) | |
| tree | 4e8ddc95016f995786c185077dce59dff53e12f0 /compilerplugins | |
| parent | 20b9cbd0e586fe89f8e1bdd942135445a256af7b (diff) | |
merge ftp::ResultSetFactory with ResultSetFactoryI
Change-Id: I061145fefef33aa3e7349adf7da03222c3b2a911
Reviewed-on: https://gerrit.libreoffice.org/26898
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 9464dd547363..aa8ff7d639f3 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -266,7 +266,6 @@ merge frm::ITextAttributeListener with frm::OAttributeDispatcher merge frm::ITextSelectionListener with frm::ORichTextPeer merge frm::OFormComponents with frm::ODatabaseForm merge ftp::CurlInput with InsertData -merge ftp::ResultSetFactory with ResultSetFactoryI merge gio::Seekable with gio::OutputStream merge i_xml_parser_event_handler with (anonymous namespace)::recently_used_file_filter merge oglcanvas::CanvasHelper with oglcanvas::BitmapCanvasHelper |