Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Romain De Laage De Bellefaye
LO21-projet
Commits
9f845ec0
Verified
Commit
9f845ec0
authored
Jun 10, 2021
by
Romain De Laage De Bellefaye
🌳
Browse files
Merge branch 'master' of gitlab.utc.fr:rdelaage/lo21-projet
parents
3db0ae55
f5c6c3b1
Changes
1
Hide whitespace changes
Inline
Side-by-side
includes/parametragemodele.h
View file @
9f845ec0
...
...
@@ -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
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment