vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix for hard merge

Browse source
This commit is contained in:
Joseph Schorr 2017-07-17 16:36:05 +03:00
parent a8b340feb6
commit 9679ec91ec
6 changed files with 54 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
endpoints/v2/labelhandlers.py
View file

@ -1,7 +1,7 @@
import logging
from app import app
from endpoints.v2.models_pre_oci import pre_oci_model as model
from endpoints.v2.models_pre_oci import data_model as model
from util.timedeltastring import convert_to_timedelta
logger = logging.getLogger(__name__)