From c41b5879c5d0f01f894eafd5b7417d1e8a2278f7 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Thu, 7 Feb 2013 12:14:09 +0100
Subject: [PATCH] Fix composer.json after merge

---
 composer.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 2ae70a9..282b658 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "monolog/monolog" : "~1.0"
     },
     "suggest": {
-	"php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg"
+        "php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg"
     },
     "require-dev": {
         "sami/sami"       : "dev-master",
@@ -33,10 +33,5 @@
         "psr-0": {
             "FFMpeg": "src"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "0.1.x-dev"
-        }
     }
 }