gitignore: Track common.env in iotests gitignore

Rather than track it in the toplevel gitignore

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Conflicts:
	.gitignore

Change-Id: I87b0c256cf728b27b9459e1a59e8cf844736ce06

diff --git a/.gitignore b/.gitignore
index de308188a7247a415a23fec1ea308df7fe0f58e1..436802733c54beeda6e4e167868302e9ee6164c6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -111,7 +111,6 @@ cscope.*
 tags
 TAGS
 *~
-/tests/qemu-iotests/common.env
 tizen/emulator
 tizen/src/build_info.h
 tizen/src/skin/client/src/about.properties

diff --git a/tests/qemu-iotests/.gitignore b/tests/qemu-iotests/.gitignore
index 0541f80daaba44c3e52603ca416ce35fcedf8720..0711cbdbf31d45c7ae24c71056570ac0c12bcf53 100644 (file)
--- a/tests/qemu-iotests/.gitignore
+++ b/tests/qemu-iotests/.gitignore
@@ -1,5 +1,6 @@
 check.log
 check.time
+common.env
 *.out.bad
 *.notrun
 socket_scm_helper