From afccbe23cecc04a08281a91e02bb25dd7b0ffdcf Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 8 May 2023 12:30:36 +0200 Subject: merge GalleryFileStorageEntry with GalleryBinaryEngineEntry Change-Id: I21b3f49cdf04b021931ab9e1171bfffa5cd76e1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151552 Tested-by: Jenkins Reviewed-by: Noel Grandin --- compilerplugins/clang/mergeclasses.results | 1 - 1 file changed, 1 deletion(-) (limited to 'compilerplugins/clang/mergeclasses.results') diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index e92d1bfc19b7..a1e8c6be6e3d 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -55,7 +55,6 @@ merge FmXDisposeListener with DisposeListenerGridBridge merge FmXFormShell_Base_Disambiguation with FmXFormShell merge GLWindow with GLX11Window merge GalleryFileStorage with GalleryBinaryEngine -merge GalleryFileStorageEntry with GalleryBinaryEngineEntry merge GroupTable with PPTWriterBase merge HostDetailsContainer with DavDetailsContainer merge IDocumentChartDataProviderAccess with sw::DocumentChartDataProviderManager -- cgit