From 6755f874760d933b6aa9aef199a045b62f1db900 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 22 Dec 2015 11:27:42 +0100
Subject: [PATCH] Fix merge

---
 src/Symfony/Component/Filesystem/Tests/FilesystemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index 3ac37bd6da..80a17cae35 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -496,7 +496,7 @@ class FilesystemTest extends FilesystemTestCase
 
         $this->filesystem->chmod($directory, 0753, 0000, true);
 
-        $this->assertEquals(753, $this->getFilePermissions($subdirectory));
+        $this->assertFilePermissions(753, $subdirectory);
     }
 
     public function testChown()