From a68ce0d585d8d0b4381cb27ff9c4ea8340c02587 Mon Sep 17 00:00:00 2001
From: Sandro Weber <webers@in.tum.de>
Date: Mon, 29 Feb 2016 11:03:10 +0100
Subject: [PATCH] [nostory] forgot pull --rebase before merging
Change-Id: I87d6fa2b35ee772b68c983a77a090c035e507b1c
---
http/client/assets/materials/OrangeTransparent.material | 1 -
1 file changed, 1 deletion(-)
diff --git a/http/client/assets/materials/OrangeTransparent.material b/http/client/assets/materials/OrangeTransparent.material
index 4f5a536..1dad60b 100644
--- a/http/client/assets/materials/OrangeTransparent.material
+++ b/http/client/assets/materials/OrangeTransparent.material
@@ -17,7 +17,6 @@ material Gazebo/OrangeTransparent
colour_op_ex source1 src_current src_current 0 1 0
alpha_op_ex source1 src_manual src_current 0.4
}
-
}
}
}
--
GitLab