Ashish has proposed merging lp:~coolyashish/postorius/CSV_EXPORT into lp:postorius.
Requested reviews: Mailman Coders (mailman-coders) For more details, see: https://code.launchpad.net/~coolyashish/postorius/CSV_EXPORT/+merge/256548 -- Your team Mailman Coders is requested to review the proposed merge of lp:~coolyashish/postorius/CSV_EXPORT into lp:postorius.
=== modified file 'src/postorius/views/list.py' --- src/postorius/views/list.py 2015-04-16 18:19:33 +0000 +++ src/postorius/views/list.py 2015-04-16 18:26:38 +0000 @@ -16,10 +16,18 @@ # You should have received a copy of the GNU General Public License along with # Postorius. If not, see <http://www.gnu.org/licenses/>. import logging -import csv - -from django.http import HttpResponse - +<<<<<<< TREE +import csv + +from django.http import HttpResponse + +======= +import csv + +from django.http import HttpResponse + +from django.conf import settings +>>>>>>> MERGE-SOURCE from django.contrib import messages from django.contrib.auth.decorators import (login_required, user_passes_test)
_______________________________________________ Mailman-coders mailing list [email protected] https://mail.python.org/mailman/listinfo/mailman-coders
