diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
| commit | 39aef29414d77492e06d872cfeaf4ba744fa9d38 (patch) | |
| tree | 708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /target/packages/pkg-available/test | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'target/packages/pkg-available/test')
| -rw-r--r-- | target/packages/pkg-available/test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test index d7bbcf26a..fe9204f9c 100644 --- a/target/packages/pkg-available/test +++ b/target/packages/pkg-available/test @@ -7,3 +7,4 @@ config ADK_PKG_TEST help Package collection used to build adk-test-framework root filesystem. + |