resolved conflicts

3 years ago · 7e27c0f67c
parent 38751062fb a19705c050
commit 7e27c0f67c
3 changed files with 7 additions and 0 deletions
--- a/diagrams/generic/os.py
+++ b/diagrams/generic/os.py
@ -16,6 +16,10 @@ class Centos(_Os):
    _icon = "centos.png"


+class Debian(_Os):
+    _icon = "debian.png"
+
+
 class IOS(_Os):
    _icon = "ios.png"

--- a/docs/nodes/generic.md
+++ b/docs/nodes/generic.md
@ -59,6 +59,9 @@ Node classes list of generic provider.
 <img width="30" src="/img/resources/generic/os/centos.png" alt="Centos" style="float: left; padding-right: 5px;" >
 **diagrams.generic.os.Centos**

+<img width="30" src="/img/resources/generic/os/debian.png" alt="Debian" style="float: left; padding-right: 5px;" >
+**diagrams.generic.os.Debian**
+
 <img width="30" src="/img/resources/generic/os/ios.png" alt="IOS" style="float: left; padding-right: 5px;" >
 **diagrams.generic.os.IOS**

--- a/resources/generic/os/debian.png
+++ b/resources/generic/os/debian.png