From fac92ff0405399b8f6d27b20144a41adea0fa500 Mon Sep 17 00:00:00 2001
From: Jonny Ervine <jonny@ervine.org>
Date: Mon, 4 Jan 2021 03:05:29 +0000
Subject: [PATCH] Update 'routes/kube_helm_routes.py'

---
 routes/kube_helm_routes.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/routes/kube_helm_routes.py b/routes/kube_helm_routes.py
index 53ba0ce..0f51d40 100644
--- 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)