From 40772a5732002081ea7b19cef2447b008a8e4675 Mon Sep 17 00:00:00 2001 From: Terrtia Date: Mon, 27 Aug 2018 11:30:19 +0200 Subject: [PATCH] fix: merge --- var/www/modules/showpaste/Flask_showpaste.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/var/www/modules/showpaste/Flask_showpaste.py b/var/www/modules/showpaste/Flask_showpaste.py index 39e2283e..40240591 100644 --- a/var/www/modules/showpaste/Flask_showpaste.py +++ b/var/www/modules/showpaste/Flask_showpaste.py @@ -9,11 +9,7 @@ import os import json import os import flask -<<<<<<< HEAD -from flask import Flask, render_template, jsonify, request, Blueprint, make_response, Response, send_from_directory -======= -from flask import Flask, render_template, jsonify, request, Blueprint, make_response, redirect, url_for, Response, send_from_directory ->>>>>>> master +from flask import Flask, render_template, jsonify, request, Blueprint, make_response, Response, send_from_directory, redirect, url_for import difflib import ssdeep