Update 'routes/kube_helm_routes.py'

2021-01-04 03:05:29 +00:00 · 2021-01-04 03:05:29 +00:00 · fac92ff040
commit fac92ff040
parent ce93547df7
1 changed files with 0 additions and 5 deletions
--- a/routes/kube_helm_routes.py
+++ b/routes/kube_helm_routes.py
@ -23,12 +23,7 @@ def chartVersions():
    table.classes = ['table-striped', 'table-condensed', 'table-hover']
    return render_template('chartRevisionList.html', table=table)

-
-<<<<<<< HEAD
-@routes.route('/nsLookup/<ns>/<namespace>')
-=======
@routes.route('/nsLookup/<ns>')
->>>>>>> a7df40eb7710553f5d0185c3fa04ea6991c06f89
 def namespaceLookup(ns):
    charts = get_charts(ns)
    return jsonify(charts)