fix merge conflict

2025-12-17 13:54:25 +01:00 · 2018-12-03 15:59:22 -07:00
parent 35d4dd0a61 eb8269156a
commit a980278a93
43 changed files with 1534 additions and 55 deletions
--- a/docker-compose-generator/src/CryptoDefinition.cs
+++ b/docker-compose-generator/src/CryptoDefinition.cs
@@ -66,10 +66,20 @@ namespace DockerGenerator
                    Crypto = "via",
                    CryptoFragment = "viacoin"
                },
-	            new CryptoDefinition()
+                new CryptoDefinition()
                {
                    Crypto = "dash",
                    CryptoFragment = "dash"
+                },
+                new CryptoDefinition()
+                {
+                    Crypto = "doge",
+                    CryptoFragment = "dogecoin"
+                },
+                new CryptoDefinition()
+                {
+                    Crypto = "mona",
+                    CryptoFragment = "monacoin"
                }
            };
        }