2018: Auto stash before merge of "dev2018" and "origin/dev2018"

app/Operations/DoubleEntropyOp.cpp

@@ -40,11 +40,15 @@ void DoubleEntropyOp::operator()(const Image_t<double>* image, const std::map<co
 
     double entropy = image->getEntropy();
     outText(qApp->translate("Operations", "Entropy of the image (sum of channels entropy) = %1\n").arg(entropy).toStdString());
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
     outText(qApp->translate("Operations", "Pas d'échantillonnage choisi : 1\n").toStdString());
 =======
  //   outText(qApp->translate("Pas d'échantillonnage choisi : 1\n"));
 >>>>>>> Stashed changes
+=======
+ //   outText(qApp->translate("Pas d'échantillonnage choisi : 1\n"));
+>>>>>>> Stashed changes
 }
 
 bool DoubleEntropyOp::needCurrentImg() const {