[pricelist] fix some merge issues

flaschengeist/plugins/pricelist/__init__.py

@@ -252,6 +252,5 @@ def set_picture(identifier):
 def _get_picture(identifier):
     if request.method == "GET":
         size = request.args.get("size")
-        path = PriceListPlugin.plugin["path"]
         response = pricelist_controller.get_drink_picture(identifier, size)
         return response.make_conditional(request)

flaschengeist/plugins/pricelist/pricelist_controller.py

@@ -5,7 +5,7 @@ from uuid import uuid4
 from flaschengeist import logger
 from flaschengeist.config import config
 from flaschengeist.database import db
-from flaschengeist.utils.picture import save_picture, get_picture
+from flaschengeist.utils.picture import save_picture, get_picture, delete_picture
 
 from .models import Drink, DrinkPrice, Ingredient, Tag, DrinkType, DrinkPriceVolume, DrinkIngredient, ExtraIngredient