fixed composer deps

dakorpar · Aug 18, 2013 · 48ba2ba · 48ba2ba
1 parent cd8d940
commit 48ba2ba
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -17,18 +17,21 @@
 	},
 	"require": {
 		"nette/nette": "@dev",
-		"doctrine/common": "~2.3"
+		"kdyby/annotations": "@dev"
 	},
 	"require-dev": {
 		"nette/tester": "@dev"
 	},
+	"conflict": {
+		"kdyby/doctrine": "0.9.*"
+	},
 	"autoload": {
 		"psr-0": {
 			"Kdyby\\Aop\\": "src/"
 		},
 		"classmap": [
 			"src/Kdyby/Aop/annotations.php",
-			"src/Kdyby/Aop/exceptions.php",
+			"src/Kdyby/Aop/exceptions.php"
 		]
 	}
 }