Skip to content

Commit

Permalink
Resolving the merge conflict
Browse files Browse the repository at this point in the history
Signed-off-by: Ritesh Hiremath <[email protected]>
  • Loading branch information
Ritesh Hiremath authored and Ritesh Hiremath committed Oct 29, 2024
2 parents 9ef8c58 + 65014f0 commit cbd6009
Show file tree
Hide file tree
Showing 225 changed files with 3,599 additions and 2,430 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<p style="clear:both;">
<h2><a href="https://layer5.io/kanvas">Kanvas</a></h2>
<a href="https://layer5.io/kanvas">
<img src="src/assets/images/kanvas/kanvas-color-icon.svg" alt="Kanvas logo" width="125px" style="margin:10px;" align="left" />
<img src="src/assets/images/kanvas/icon-only/kanvas-icon-color.svg" alt="Kanvas logo" width="125px" style="margin:10px;" align="left" />
</a>
<a href="https://layer5.io/kanvas">Kanvas</a> is an end-to-end management platform, here to help teams understand problems, deploy designs, apply patterns, manage and operate your deployments and services in real-time.
<br /><br /><br/>
Expand Down
Binary file added src/assets/brand/kanvas-brand-kit.zip
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions src/assets/images/kanvas/horizontal/kanvas-horizontal-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions src/assets/images/kanvas/horizontal/kanvas-horizontal-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions src/assets/images/kanvas/icon-only/kanvas-icon-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 26 additions & 1 deletion src/assets/images/kanvas/icon-only/kanvas-icon-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
1 change: 0 additions & 1 deletion src/assets/images/kanvas/icon-only/kanvas-icon.svg

This file was deleted.

Binary file not shown.
Loading

0 comments on commit cbd6009

Please sign in to comment.