From 48ba2ba8377c62bba83d1efc6f2689e785c71cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Proch=C3=A1zka?= <filip@prochazka.su>
Date: Sun, 18 Aug 2013 11:17:50 +0200
Subject: [PATCH] fixed composer deps

---
 composer.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 1b2c261..e05bfbd 100644
--- 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"
 		]
 	}
 }