[mb-commits] branch, data-nes, updated. Removing some unused declarations

The branch, data-nes has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=bb1afddc602e27ee155f4eea3e3648a6667e54ae (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f34d69bf238086c2acf46f9e4cde9224b5be94ce (commit)

Summary of changes:
 lib/MusicBrainz/Server/Controller/Role/Merge.pm |    5 -----
 lib/MusicBrainz/Server/Controller/Work.pm       |    8 ++------
 2 files changed, 2 insertions(+), 11 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bb1afddc602e27ee155f4eea3e3648a6667e54ae
Author: Oliver Charles <[email protected]>
Date:   Wed Feb 6 12:01:22 2013 +0000

    Removing some unused declarations

diff --git a/lib/MusicBrainz/Server/Controller/Role/Merge.pm b/lib/MusicBrainz/Server/Controller/Role/Merge.pm
index 38a5c84..b21cecb 100644
--- a/lib/MusicBrainz/Server/Controller/Role/Merge.pm
+++ b/lib/MusicBrainz/Server/Controller/Role/Merge.pm
@@ -7,11 +7,6 @@ use MusicBrainz::Server::Log qw( log_assertion );
 use MusicBrainz::Server::MergeQueue;
 use MusicBrainz::Server::Translation qw ( l ln );
 
-parameter 'edit_type' => (
-    isa => 'Int',
-    required => 1
-);
-
 parameter 'merge_form' => (
     isa => 'Str',
     default => 'Merge'
diff --git a/lib/MusicBrainz/Server/Controller/Work.pm b/lib/MusicBrainz/Server/Controller/Work.pm
index 37467f1..d0ea9d6 100644
--- a/lib/MusicBrainz/Server/Controller/Work.pm
+++ b/lib/MusicBrainz/Server/Controller/Work.pm
@@ -3,14 +3,11 @@ use Moose;
 
 BEGIN { extends 'MusicBrainz::Server::Controller'; }
 
-use MusicBrainz::Server::Constants qw(
-    $EDIT_WORK_MERGE
-);
 use MusicBrainz::Server::Entity::ISWC;
-use MusicBrainz::Server::Entity::Work;
 use MusicBrainz::Server::Entity::Tree::Work;
-use MusicBrainz::Server::Translation qw( l );
+use MusicBrainz::Server::Entity::Work;
 use MusicBrainz::Server::NES::Controller::Utils qw( create_edit create_update );
+use MusicBrainz::Server::Translation qw( l );
 
 __PACKAGE__->config(
     tree_entity => 'MusicBrainz::Server::Entity::Tree::Work',
@@ -94,7 +91,6 @@ sub work_tree {
 }
 
 with 'MusicBrainz::Server::Controller::Role::Merge' => {
-    edit_type => $EDIT_WORK_MERGE,
     confirmation_template => 'work/merge_confirm.tt',
     search_template       => 'work/merge_search.tt',
 };

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server