MergeKonflikte beseitigt

ToolV00.py

@@ -219,15 +219,12 @@ def NotenspiegelAusgabe():
 		Label(root, width =  int(float(Notenverteilung[i])/float(len(Studenten))*128), background = Farbauswahl[Farbe]).grid(row = i, column = 1, sticky = W, pady = 4)
 	Button(root, text = "Beenden", command = root.destroy).grid(row = 0, column = 2)
 	root.mainloop()
-<<<<<<< HEAD
-=======
 def DatenAnpassen():
 	for i in range(len(Studenten)):
 		if Studenten[i][0] >= 10**15:
 			Studenten[i][0] = Studenten[i][0] - (Studenten[i][0] / 10**15) * 10**15
 		if len(Studenten[i][1]) >= 16:
 			Studenten[i][1] = Studenten[i][1][0:15]
->>>>>>> 2476b640e1efcc92353c19f0d6771d4ff5a092d0
 def TextdateiErstellen():
 	Datei = open(name, "w")
 	Datei.write("Name der Klausur:\t%s\n" % (name))
@@ -301,15 +298,9 @@ def AlteKlausur():
 		NichtExistenzVerkuenden()
 mainroot = Tk()
 mainroot.title("Hauptmenue")
-<<<<<<< HEAD
-Button(mainroot, text = "Neue Klausur", command = NeueKlausur).grid(row = 1, column = 0)
-Button(mainroot, text = "Alte Klausur bearbeiten", command = AlteKlausur).grid(row = 2, column = 0)
-Button(mainroot, text = "Beenden", foreground = "red", command = mainroot.destroy).grid(row = 4, column = 0)
-=======
 button1 = Button(mainroot, text = "Neue Klausur", command = NeueKlausur)
-button2 = Button(mainroot, text = "Alte Klausur bearbeiten", command = AlteKlausur)
-button1.grid()
-button2.grid()
->>>>>>> 2476b640e1efcc92353c19f0d6771d4ff5a092d0
+button1.grid(row = 1, column = 0)
+button2 = Button(mainroot, text = "Alte Klausur erweitern", command = AlteKlausur)
+button2.grid(row = 2, column = 0)
 mainroot.mainloop()