diff options
| author |   Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2016-03-16 09:54:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-04-06 15:10:54 +0000 |
| commit | 69753324132d2d8552ca94ceea67dc37405f3baa (patch) | |
| tree | 7a48e53cce35d50925742a65447ca7be597fb6f2 /upstream | |
| parent | db645538751f3e4c7f8a66bd6b39b29807f79df1 (diff) | |
Updated armband
Project: fuel e7a78baae49f02b4303b6204eea7de01c527744c
Enable merge of the versions struct of a plugin
Redoing this the reverted patch. The original idea
that everyone which wants to merge lists has to
code that, is not wanted. So the Exception will
become a warning.
This reverts commit 552536f5319d6ead73118d0cfd701d648e99df28.
Change-Id: Ib15541199054da27c1a2aec68b5c1436da9622c9
(cherry picked from commit fb238de7c9833e91771ee4448f425f45168f8e6e)
Diffstat (limited to 'upstream')
| m--------- | upstream/fuel | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/upstream/fuel b/upstream/fuel -Subproject f455b4cd1870a97c599fa4aba5c9934e5b2c457 +Subproject e7a78baae49f02b4303b6204eea7de01c527744 |