Add ODM docs for tests

Author: silverbackdan

tests/Fixtures/TestBundle/Document/DummyDtoOutputFallbackToSameClass.php

@@ -30,23 +30,35 @@ class DummyDtoOutputFallbackToSameClass
     /**
      * @var int The id
      *
+<<<<<<< HEAD
      * @ORM\Column(type="integer")
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="AUTO")
+=======
+     * @ODM\Id(strategy="INCREMENT", type="integer", nullable=true)
+>>>>>>> Add ODM docs for tests
      */
     private $id;
 
     /**
      * @var string
      *
+<<<<<<< HEAD
      * @ORM\Column
+=======
+     * @ODM\Field
+>>>>>>> Add ODM docs for tests
      */
     public $lorem;
 
     /**
      * @var string
      *
+<<<<<<< HEAD
      * @ORM\Column
+=======
+     * @ODM\Field
+>>>>>>> Add ODM docs for tests
      */
     public $ipsum;
 

tests/Fixtures/TestBundle/Document/DummyDtoOutputSameClass.php

@@ -29,23 +29,35 @@ class DummyDtoOutputSameClass
     /**
      * @var int The id
      *
+<<<<<<< HEAD
      * @ORM\Column(type="integer")
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="AUTO")
+=======
+     * @ODM\Id(strategy="INCREMENT", type="integer", nullable=true)
+>>>>>>> Add ODM docs for tests
      */
     private $id;
 
     /**
      * @var string
      *
+<<<<<<< HEAD
      * @ORM\Column
+=======
+     * @ODM\Field
+>>>>>>> Add ODM docs for tests
      */
     public $lorem;
 
     /**
      * @var string
      *
+<<<<<<< HEAD
      * @ORM\Column
+=======
+     * @ODM\Field
+>>>>>>> Add ODM docs for tests
      */
     public $ipsum;