From eb8050945da4da749d5a0a3db107fd8db5182fc2 Mon Sep 17 00:00:00 2001
From: Holly Szumila <hszumila@jlab.org>
Date: Fri, 20 Oct 2017 10:03:38 -0400
Subject: [PATCH] fixed stash print (#234)
---
onlineGUI/onlineGUI_v1.2.1/online.C | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/onlineGUI/onlineGUI_v1.2.1/online.C b/onlineGUI/onlineGUI_v1.2.1/online.C
index 534cc609..21a382ba 100755
--- a/onlineGUI/onlineGUI_v1.2.1/online.C
+++ b/onlineGUI/onlineGUI_v1.2.1/online.C
@@ -980,13 +980,9 @@ void OnlineGUI::CreateGUI(const TGWindow *p, UInt_t w, UInt_t h)
void OnlineGUI::DoDraw()
{
-<<<<<<< Updated upstream
- // The main Drawing Routine.
-
-=======
+
// The main Drawing Routine.
->>>>>>> Stashed changes
#ifdef INTERNALSTYLE
gStyle->SetOptStat(1110);
gStyle->SetStatFontSize(0.1);
@@ -1007,19 +1003,6 @@ void OnlineGUI::DoDraw()
gStyle->SetOptLogz(0);
}
#ifdef INTERNALSTYLE
-<<<<<<< Updated upstream
- gStyle->SetTitleH(0.10);
- gStyle->SetTitleW(0.40);
- // gStyle->SetLabelSize(0.10,"X");
- // gStyle->SetLabelSize(0.10,"Y");
- gStyle->SetLabelSize(0.05,"X");
- gStyle->SetLabelSize(0.05,"Y");
- gStyle->SetPadLeftMargin(0.14);
- gStyle->SetNdivisions(505,"X");
- gStyle->SetNdivisions(404,"Y");
- gStyle->SetPalette(1);
- gROOT->ForceStyle();
-=======
gStyle->SetTitleH(0.10);
gStyle->SetTitleW(0.40);
//gStyle->SetLabelSize(0.10,"X");
@@ -1033,7 +1016,6 @@ void OnlineGUI::DoDraw()
gStyle->SetNdivisions(404,"Y");
gStyle->SetPalette(1);
gROOT->ForceStyle();
->>>>>>> Stashed changes
#endif
// Determine the dimensions of the canvas..
--
GitLab