fix mid-air collision of commits

Change-Id: I72a267045dd532a341d062cf13b7393779f579c6

fix mid-air collision of commits
Change-Id: I72a267045dd532a341d062cf13b7393779f579c6
d7f9b769 · Noel Grandin · a413832f · d7f9b769
Kaydet (Commit) d7f9b769 authored Şub 19, 2013 tarafından Noel Grandin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

SalAquaFilePicker.hxx fpicker/source/aqua/SalAquaFilePicker.hxx +0 -1

No files found.
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -23,7 +23,6 @@
 #include <cppuhelper/compbase4.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/beans/StringPair.hpp>