[Rt-commit] rtir branch, master, updated. 3.3.0-151-g4667ce0

[Shawn Moore]

The branch, master has been updated
       via  4667ce046340f4410c88905efe4c1509f59612e7 (commit)
      from  e83046e32c42e86c4354c649aa2d74e36808f5b2 (commit)

Summary of changes:
 etc/upgrade/3.3.2/content | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 4667ce046340f4410c88905efe4c1509f59612e7
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Wed May 25 23:12:23 2016 +0000

    Fix mismerge

diff --git a/etc/upgrade/3.3.2/content b/etc/upgrade/3.3.2/content
index db69003..9dd5a34 100644
--- a/etc/upgrade/3.3.2/content
+++ b/etc/upgrade/3.3.2/content
@@ -111,7 +111,7 @@ our @Final = (
 
         # create new queues etc
         for my $constituency ( @constituencies ) {
-            my $manager = RT::IR::ConstituencyManager->new(Constituency => $con
+            my $manager = RT::IR::ConstituencyManager->new(Constituency => $constituency);
             $manager->AddConstituency;
         }
 

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