Skip to content

fix: remove merge-conflict markers committed to ground_truth.json and .gitignore #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vbabenko97 merged 1 commit into from
Sep 18, 2026
Merged

fix: remove merge-conflict markers committed to ground_truth.json and .gitignore #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,14 @@ flare/jobs/
flare/kits/
.local_fed/
.next
<<<<<<< HEAD
<<<<<<< HEAD
=======
=======
>>>>>>> b05bac27146e3cacfc9e8a99a06e67a2150ddf78
*.csv
*.bed
*.bim
*.fam
*_geno.*
site*_nordik_sim.*
<<<<<<< HEAD
.remote/
server/api_out/
frontend/.next/
frontend/AGENTS.md
frontend/CLAUDE.md
>>>>>>> 1589cd5ef94e40e0c3866ba2b7a45973a101a81c
=======
>>>>>>> b05bac27146e3cacfc9e8a99a06e67a2150ddf78
10 changes: 0 additions & 10 deletions data/ground_truth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,23 +236,13 @@
"snp_rs013"
],
"coef": {
<<<<<<< HEAD
"intercept": 89.2728860425527,
"age": 0.5055436521435493,
"sex": 4.203368841196912,
"bmi": 0.8062409982940054,
"ldl": 1.2189188961362305,
"snp_rs001": 2.3934157478351294,
"snp_rs007": -1.2816779284343325,
=======
"intercept": 89.27288604255267,
"age": 0.5055436521435472,
"sex": 4.203368841196912,
"bmi": 0.8062409982940094,
"ldl": 1.2189188961362498,
"snp_rs001": 2.3934157478351223,
"snp_rs007": -1.2816779284343316,
>>>>>>> fffe7185c787e67d9476d0f02c3d2469b8e2b5f0
"snp_rs013": 0.9002997078401026
}
},
Expand Down
Loading