alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Themes] Resolve conflicts

Browse Source 
Resolve conflicts in preparation for merge, nasa/openmctweb#118
This commit is contained in:
Victor Woeltjen
2015-09-22 16:09:42 -07:00
parent aba0969312 54334a8906
commit dbe1875e70
95 changed files with 11085 additions and 6512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/commonUI/inspect/res/templates/info-button.html
View File

@@ -22,4 +22,3 @@
<!--The icon for the info button appearing in a grid item (list in folder)-->
<a class='ui-symbol icon mobile-info'>&#xe608;</a>