From 7daff1a99efeade4c87c52714c90c998c6f647ad Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Wed, 29 Nov 2017 20:20:26 +0000
Subject: [PATCH] Fixed a build error

---
 .../juce_gui_basics/native/juce_win32_FileChooser.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
index b20781e0f4..2238bf20b8 100644
--- a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
+++ b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
@@ -533,21 +533,12 @@ public:
     {
         SafePointer<Native> safeThis (this);
 
-<<<<<<< Updated upstream
-        enterModalState (true, ModalCallbackFunction::create(
-                        [safeThis] (int)
-                        {
-                            if (safeThis != nullptr)
-                                safeThis->owner.finished (safeThis->nativeFileChooser->results);
-                        }));
-=======
         enterModalState (true, ModalCallbackFunction::create (
                          [safeThis] (int)
                          {
                              if (safeThis != nullptr)
-                                 safeThis->owner.finished (safeThis->nativeFileChooser->results, true);
+                                 safeThis->owner.finished (safeThis->nativeFileChooser->results);
                          }));
->>>>>>> Stashed changes
 
         nativeFileChooser->open (true);
     }