3 files changed, 2 insertions, 21 deletions

diff --git a/src/Wallabag/UserBundle/Entity/Group.php b/src/Wallabag/UserBundle/Entity/Group.php
deleted file mode 100644
index 9145959d..00000000
--- a/src/Wallabag/UserBundle/Entity/Group.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Wallabag\UserBundle\Entity;
-
-use FOS\UserBundle\Model\Group as BaseGroup;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="`group`")
- */
-class Group extends BaseGroup
-{
-    /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    protected $id;
-}
diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index 781f7b03..7da0d1d5 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -98,7 +98,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
     private $authCode;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Wallabag\UserBundle\Entity\Group")
+     * @ORM\ManyToMany(targetEntity="Wallabag\GroupBundle\Entity\Group")
      * @ORM\JoinTable(name="user_group",
      *      joinColumns={@ORM\JoinColumn(name="user_id", referencedColumnName="id")},
      *      inverseJoinColumns={@ORM\JoinColumn(name="group_id", referencedColumnName="id")}
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
index 15002632..9d5abcaf 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -30,6 +30,7 @@
                                 {{ form_rest(searchForm) }}
                             </form>
                         </div>
+
                     </div>
 
                     <table class="bordered">