From 2d3cb6af6a6dabc04042f32ee3ee207c34c62bb2 Mon Sep 17 00:00:00 2001 From: Jonas Braathen Date: Tue, 17 Feb 2015 09:36:32 +0100 Subject: [PATCH] Sloppy conflict resolution --- tekstmelding.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tekstmelding.py b/tekstmelding.py index 60073e7..39fca79 100644 --- a/tekstmelding.py +++ b/tekstmelding.py @@ -339,13 +339,8 @@ def renew_membership_delivered(incoming_id=None, dlr_id=None, user_id=None): def new_membership(incoming_id=None, number=None): activation_code = generate_activation_code() -<<<<<<< HEAD - content = u"Velkommen! Dette er et midlertidig medlemsbevis. Aktiver medlemskapet ditt her: http://s.neuf.no/sms/%(number)s/%(activation_code)s" % ({ + content = u"Velkommen! Dette er et midlertidig medlemsbevis. Aktiver medlemskapet ditt her: https://s.neuf.no/sms/%(number)s/%(activation_code)s" % ({ 'number': number, -======= - message = u"Velkommen! Dette er et midlertidig medlemsbevis. Aktiver medlemskapet ditt her: https://s.neuf.no/sms/%(gsm)s/%(activation_code)s" % ({ - 'gsm': gsm, ->>>>>>> master 'activation_code': activation_code, })