🔧 Commit composer.lock because we use dev-master branch

Vincent Langlet · Vincent Langlet · commit 1bed08e4d98e · 2017-04-18T01:21:55.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,3 @@
-cache.properties
-phpunit.xml
-composer.lock
+.idea/
 composer.phar
 vendor/
-build/
diff --git a/composer.json b/composer.json
@@ -19,12 +19,7 @@
             "email": "vincentl@theodo.fr"
         }
     ],
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.x-dev"
-        }
-    },
     "require": {
-        "squizlabs/php_codesniffer": "2.x-dev"
+        "squizlabs/php_codesniffer": "dev-master"
     }
 }
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,7 @@`
`19`	`19`	`"email": "vincentl@theodo.fr"`
`20`	`20`	`}`
`21`	`21`	`],`
`22`		`- "extra": {`
`23`		`- "branch-alias": {`
`24`		`- "dev-master": "2.x-dev"`
`25`		`- }`
`26`		`- },`
`27`	`22`	`"require": {`
`28`		`- "squizlabs/php_codesniffer": "2.x-dev"`
	`23`	`+ "squizlabs/php_codesniffer": "dev-master"`
`29`	`24`	`}`
`30`	`25`	`}`