Skip to content
Snippets Groups Projects
Verified Commit 2a432611 authored by orestis.malaspin's avatar orestis.malaspin
Browse files

fixed conflict

parents a5f41715 05ac4bd4
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
slides/structs.md
+ 2
− 2
View file @ 2a432611
...@@ -90,8 +90,8 @@ struct fraction frac; // déclaration de frac ...@@ -90,8 +90,8 @@ struct fraction frac; // déclaration de frac
int32_t num, int32_t denom) int32_t num, int32_t denom)
{ {
// f a déjà été allouée // f a déjà été allouée
f>num = num; f->num = num;
f>denom = denom; f->denom = denom;
} }
int main() { int main() {
fraction_t frac; // on alloue une fraction fraction_t frac; // on alloue une fraction
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment