Commit c1bf7bc5 authored by Maxime Goret's avatar Maxime Goret
Browse files

ajustement version

parent 2bbe2ca8
......@@ -81,12 +81,10 @@ public slots:
void affGrille();
void modifGrille(const QModelIndex& index);
void paramRegle(const QString& choix_regle);
<<<<<<< HEAD
void choisirEtatCourant(const QString& validEtat);
=======
void choisirEtatCourant(bool checked);
void parametrerEtats();
>>>>>>> b75009b4f263c0958c988e2906423ed9f3c2a961
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment