From 510ec6b91c4f7727dbab731c083444c4c44a8043 Mon Sep 17 00:00:00 2001
From: Padraic Brady <padraic.brady@gmail.com>
Date: Thu, 29 Jan 2015 20:57:23 +0000
Subject: [PATCH] A couple of minor omissions from the merge

---
 src/Composer/Command/CreateProjectCommand.php | 7 +------
 src/Composer/Command/SelfUpdateCommand.php    | 3 ++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php
index 1254ab794..1bf7c307c 100644
--- a/src/Composer/Command/CreateProjectCommand.php
+++ b/src/Composer/Command/CreateProjectCommand.php
@@ -239,19 +239,14 @@ EOT
     {
         if (null === $repositoryUrl) {
             $sourceRepo = new CompositeRepository(Factory::createDefaultRepositories($io, $config));
-<<<<<<< HEAD
-        } elseif ("json" === pathinfo($repositoryUrl, PATHINFO_EXTENSION)) {
-            $sourceRepo = new FilesystemRepository(new JsonFile($repositoryUrl, Factory::createRemoteFilesystem($io, $config)));
-=======
         } elseif ("json" === pathinfo($repositoryUrl, PATHINFO_EXTENSION) && file_exists($repositoryUrl)) {
-            $json = new JsonFile($repositoryUrl, new RemoteFilesystem($io, $config));
+            $json = new JsonFile($repositoryUrl, Factory::createRemoteFilesystem($io, $config));
             $data = $json->read();
             if (!empty($data['packages']) || !empty($data['includes']) || !empty($data['provider-includes'])) {
                 $sourceRepo = new ComposerRepository(array('url' => 'file://' . strtr(realpath($repositoryUrl), '\\', '/')), $io, $config);
             } else {
                 $sourceRepo = new FilesystemRepository($json);
             }
->>>>>>> master
         } elseif (0 === strpos($repositoryUrl, 'http')) {
             $sourceRepo = new ComposerRepository(array('url' => $repositoryUrl), $io, $config);
         } else {
diff --git a/src/Composer/Command/SelfUpdateCommand.php b/src/Composer/Command/SelfUpdateCommand.php
index 8f766f4c4..6dd8c4362 100644
--- a/src/Composer/Command/SelfUpdateCommand.php
+++ b/src/Composer/Command/SelfUpdateCommand.php
@@ -70,7 +70,8 @@ EOT
         }
         $remoteFilesystem = Factory::createRemoteFilesystem($this->getIO(), $config);
 
-        //$baseUrl = (extension_loaded('openssl') ? 'https' : 'http') . '://' . self::HOMEPAGE;
+        // TODO: Silent switch probably should be kicking out exception
+        $baseUrl = (extension_loaded('openssl') ? 'https' : 'http') . '://' . self::HOMEPAGE;
 
         $cacheDir = $config->get('cache-dir');
         $rollbackDir = $config->get('home');