mattercontrol/PrintLibrary/ExportLibraryItemWindow.cs.rej
gregory-diaz 0e592f7317 Corrected problems with the view window Print Item
Every time the "view" link on a "print queue item" is clicked a new
window would open. I made changes so that it only opens once regardless
of how many times it is clicked on.
2014-02-18 15:18:58 -08:00

13 lines
458 B
Text

diff a/PrintLibrary/ExportLibraryItemWindow.cs b/PrintLibrary/ExportLibraryItemWindow.cs (rejected hunks)
@@ -9,7 +9,11 @@
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrintQueue;
using MatterHackers.GCodeVisualizer;
+<<<<<<< HEAD
using MatterHackers.Localizations;
+=======
+using MatterHackers.MatterControl.SlicerConfiguration;
+>>>>>>> upstream/development
namespace MatterHackers.MatterControl.PrintLibrary
{