summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-11-11 13:33:16 +0100
committerAndrey Andreev <narf@devilix.net>2014-11-11 13:33:16 +0100
commit8f7d3d2fccc097c85cc403b58df6c5fc35418579 (patch)
tree5bc1ef2a75abb0d85a3ab2cece365eed9e516470 /composer.json
parent4f50256a84e8052fc3356683f28286d36f8a322c (diff)
parent81c934729d9fcbb294a8914608c315eed30ff9c4 (diff)
Fix merge conflicts
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json5
1 files changed, 3 insertions, 2 deletions
diff --git a/composer.json b/composer.json
index 0f98fe7a0..4ff60c57e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,7 @@
{
- "description" : "Dependencies for CodeIgniter's testing environment",
- "name" : "ellislab/codeigniter",
+ "description" : "The CodeIgniter framework",
+ "name" : "codeigniter/framework",
+ "license": "MIT",
"require": {
"php": ">=5.2.4"
},