launchpad-reviewers team mailing list archive

[jugmac00 <mp+409833@xxxxxxxxxxxxxxxxxx>]

jugmac00 has proposed merging ~jugmac00/launchpad:update-outdated-docstring into launchpad:master.

Commit message:
Update outdated docstring

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jugmac00/launchpad/+git/launchpad/+merge/409833
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~jugmac00/launchpad:update-outdated-docstring into launchpad:master.

diff --git a/lib/lp/registry/interfaces/teammembership.py b/lib/lp/registry/interfaces/teammembership.py
index e94e730..cc2427e 100644
--- a/lib/lp/registry/interfaces/teammembership.py
+++ b/lib/lp/registry/interfaces/teammembership.py
@@ -258,6 +258,7 @@ class ITeamMembership(Interface):
 class ITeamMembershipSet(Interface):
     """A Set for TeamMembership objects."""
 
+<<<<<<< lib/lp/registry/interfaces/teammembership.py
     def handleMembershipsExpiringToday(reviewer, logger=None):
         """Expire or renew the memberships flagged to expire today.
 
@@ -265,6 +266,10 @@ class ITeamMembershipSet(Interface):
         (keeping the same status) and send a notification to the member and
         team admins. Otherwise flag the membership as expired.
         """
+=======
+    def handleMembershipsExpiringToday(reviewer):
+        """Flag the membership as expired."""
+>>>>>>> lib/lp/registry/interfaces/teammembership.py
 
     def getMembershipsToExpire(when=None):
         """Return all TeamMemberships that should be expired.