Verified Commit 9f845ec0 authored by Romain De Laage De Bellefaye's avatar Romain De Laage De Bellefaye 🌳
Browse files

Merge branch 'master' of gitlab.utc.fr:rdelaage/lo21-projet

parents 3db0ae55 f5c6c3b1
......@@ -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
};
......
Supports Markdown
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