From 69753324132d2d8552ca94ceea67dc37405f3baa Mon Sep 17 00:00:00 2001
From: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Date: Wed, 16 Mar 2016 09:54:01 +0000
Subject: 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)
---
 upstream/fuel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'upstream')

diff --git a/upstream/fuel b/upstream/fuel
index f455b4cd..e7a78baa 160000
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit f455b4cd1870a97c599fa4aba5c9934e5b2c4574
+Subproject commit e7a78baae49f02b4303b6204eea7de01c527744c
-- 
cgit 1.2.3-korg