language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 00:01:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Resolve conflicts

Browse source
This commit is contained in:
Chadtech 2020-12-08 16:56:52 -05:00
commit 2a068941b2
72 changed files with 2838 additions and 1933 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/builtins/src/unique.rs
View file

@ -1207,7 +1207,7 @@ fn int_type(u: VarId) -> SolvedType {
vec![
flex(u),
SolvedType::Alias(
Symbol::NUM_INT,
Symbol::NUM_I64,
Vec::new(),
Box::new(builtin_aliases::num_type(SolvedType::Apply(
Symbol::ATTR_ATTR,