From cad4ba7a9f33789179cdee6fa3ac26f40f282f67 Mon Sep 17 00:00:00 2001 From: Kobert Date: Tue, 5 Jun 2018 00:06:37 +0200 Subject: Merge fix --- DiscoBot/DSA_Game/Dsa.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DiscoBot/DSA_Game/Dsa.cs') diff --git a/DiscoBot/DSA_Game/Dsa.cs b/DiscoBot/DSA_Game/Dsa.cs index c645eb7..d580ed5 100644 --- a/DiscoBot/DSA_Game/Dsa.cs +++ b/DiscoBot/DSA_Game/Dsa.cs @@ -33,7 +33,7 @@ Relation.Add("Nicolas", "Hartmut Reiher"); Relation.Add("TrueKuehli", "Ledur Torfinson"); - relation.Add("Papo","Gwendelson"); + //Relation.Add("Papo","Gwendelson"); //Relation.Add("Papo", "Pump aus der Gosse"); //Nachteile für LE, AE, MR @@ -41,7 +41,7 @@ //Vorteile für LE, AE, MR //Relation.Add("Papo", "Beef"); - //Relation.Add("Papo", "Astrallos"); + Relation.Add("Papo", "Astrallos"); Relation.Add("Potus", "Potus"); -- cgit v1.2.3-70-g09d2 From 3860f7313b4f859acb1feb90016cc3656bc24912 Mon Sep 17 00:00:00 2001 From: Kobert-P Date: Tue, 5 Jun 2018 22:32:00 +0200 Subject: Testcommit --- DiscoBot/DSA_Game/Dsa.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DiscoBot/DSA_Game/Dsa.cs') diff --git a/DiscoBot/DSA_Game/Dsa.cs b/DiscoBot/DSA_Game/Dsa.cs index d580ed5..e514691 100644 --- a/DiscoBot/DSA_Game/Dsa.cs +++ b/DiscoBot/DSA_Game/Dsa.cs @@ -40,8 +40,8 @@ // Relation.Add("Papo", "Angilbert Arres"); //Vorteile für LE, AE, MR - //Relation.Add("Papo", "Beef"); - Relation.Add("Papo", "Astrallos"); + Relation.Add("Papo", "Beef"); + //Relation.Add("Papo", "Astrallos"); Relation.Add("Potus", "Potus"); -- cgit v1.2.3-70-g09d2