Fix after rebase

cookbook/views/data.py

@@ -93,7 +93,9 @@ def batch_edit(request):
             msg = ngettext(
                 'Batch edit done. %(count)d recipe was updated.',
                 'Batch edit done. %(count)d Recipes where updated.',
-                count) % {'count': count, }
+                count) % {
+                      'count': count,
+                  }
             messages.add_message(request, messages.SUCCESS, msg)
 
             return redirect('data_batch_edit')
@@ -186,12 +188,7 @@ def import_url(request):
 
         return HttpResponse(reverse('view_recipe', args=[recipe.pk]))
 
-    elif 'id' in request.GET:
-        context = {'bookmarklet': request.GET.get('id')}
-    else:
-        context = {}
-
-    return render(request, 'url_import.html', context)
+    return render(request, 'url_import.html', {})
 
 
 class Object(object):