Skip to content
Snippets Groups Projects
Commit a68ce0d5 authored by Sandro Weber's avatar Sandro Weber
Browse files

[nostory] forgot pull --rebase before merging 

Change-Id: I87d6fa2b35ee772b68c983a77a090c035e507b1c
parent 4c495a0b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
http/client/assets/materials/OrangeTransparent.material
+ 0
− 1
View file @ a68ce0d5
...@@ -17,7 +17,6 @@ material Gazebo/OrangeTransparent ...@@ -17,7 +17,6 @@ material Gazebo/OrangeTransparent
colour_op_ex source1 src_current src_current 0 1 0 colour_op_ex source1 src_current src_current 0 1 0
alpha_op_ex source1 src_manual src_current 0.4 alpha_op_ex source1 src_manual src_current 0.4
} }
} }
} }
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment