Commit e70f465c authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 02f45d00
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
---
>>>>>>> 7d8a70789d7e1f21d4dd4aa245ca9030ea496c52
apiVersion: v1
kind: Service
metadata: