From 480b6390acabd75d4643ddacf97ef892219d8549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Wed, 12 Jun 2013 22:55:23 +0200
Subject: [PATCH] Resolved merge conflicts from commit 83ba3cf

---
 src/Definition/ClassDefinition.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Definition/ClassDefinition.php b/src/Definition/ClassDefinition.php
index ea3ac9fa..0d3fd52d 100644
--- a/src/Definition/ClassDefinition.php
+++ b/src/Definition/ClassDefinition.php
@@ -15,9 +15,7 @@
 /**
  * Class definitions for a single class
  */
-class ClassDefinition implements
-    DefinitionInterface,
-    PartialMarker
+class ClassDefinition implements DefinitionInterface, PartialMarker
 {
     /**
      * @var null|string