Fix merge mistake

Peter Amstutz · Peter Amstutz · commit 20cdf6ce3185 · 2019-01-24T09:43:57.000-05:00
diff --git a/conformance_tests.yaml b/conformance_tests.yaml
@@ -2586,8 +2586,6 @@
         ]
     }
   tags: [ resource, command_line_tool ]
-=======
-  tags: [ command_line_tool, networkaccess ]
 
 - job: tests/env-job3.yaml
   output:

Original file line number	Diff line number	Diff line change
`@@ -2586,8 +2586,6 @@`
`2586`	`2586`	`]`
`2587`	`2587`	`}`
`2588`	`2588`	`tags: [ resource, command_line_tool ]`
`2589`		`-=======`
`2590`		`- tags: [ command_line_tool, networkaccess ]`
`2591`	`2589`
`2592`	`2590`	`- job: tests/env-job3.yaml`
`2593`	`2591`	`output:`