summaryrefslogtreecommitdiff
path: root/tests/update_fixtures/osctest/conflict/.osc/nochange
diff options
context:
space:
mode:
authorZhang Qiang <qiang.z.zhang@intel.com>2014-05-08 15:24:58 +0800
committerZhang Qiang <qiang.z.zhang@intel.com>2014-07-03 09:29:16 +0800
commitaf673cc12a0d6d145f4662bfa98e86288b04ca24 (patch)
treedc19becaad9716aed8a91999749af015c33bd84f /tests/update_fixtures/osctest/conflict/.osc/nochange
parent01830214ab8ab8bf2b4f3e34a63874857e4953ca (diff)
downloadosc-af673cc12a0d6d145f4662bfa98e86288b04ca24.tar.gz
osc-af673cc12a0d6d145f4662bfa98e86288b04ca24.tar.bz2
osc-af673cc12a0d6d145f4662bfa98e86288b04ca24.zip
clean up unit testupstream/0.139.0upstream
Change-Id: I3aaf9e4d01071d229f6f630e453042ef2618fe4c
Diffstat (limited to 'tests/update_fixtures/osctest/conflict/.osc/nochange')
-rw-r--r--tests/update_fixtures/osctest/conflict/.osc/nochange1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/update_fixtures/osctest/conflict/.osc/nochange b/tests/update_fixtures/osctest/conflict/.osc/nochange
deleted file mode 100644
index 0569b03..0000000
--- a/tests/update_fixtures/osctest/conflict/.osc/nochange
+++ /dev/null
@@ -1 +0,0 @@
-This file didn't change.