Skip to content

Commit

Permalink
fix: merge conflict update submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
ashleysyg committed Sep 5, 2023
1 parent 8c361d7 commit 300cab7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion content
Submodule content updated 92 files
+10 −26 .github/workflows/preview_on_pr.yml
+2 −6 .github/workflows/prod_deply_on_merge.yml
+1 −2 .gitignore
+6 −7 about/facilities.md
+35 −58 about/people.yml
+2 −2 about/teams.md
+0 −0 banners/.gitkeep
+0 −0 banners/announcements/.gitkeep
+43 −0 banners/covid.yml
+0 −714 blog/nextflow.md
+90 −0 blog/test-1.md
+16 −0 blog/test-2.md
+0 −59 blog/vr-volume-viewer.md
+ − images/blog/nextflow/FastQC.png
+ − images/blog/nextflow/count words workflow output with custom parameter.png
+ − images/blog/nextflow/count words workflow output.png
+ − images/blog/nextflow/create github token.png
+ − images/blog/nextflow/nextflow generated commands.png
+ − images/blog/nextflow/reproduce.png
+ − images/blog/nextflow/workflow output 2.png
+ − images/blog/nextflow/workflow output with custom parameter.png
+ − images/blog/nextflow/workflow output.png
+ − images/blog/nextflow/workflow.png
+ − images/blog/test.png
+ − images/blog/vr-volume-viewer/image1.png
+ − images/blog/vr-volume-viewer/image2.png
+ − images/blog/vr-volume-viewer/image3.png
+ − images/blog/vr-volume-viewer/image4a.png
+ − images/blog/vr-volume-viewer/image4b.png
+ − images/people/aisulu_hover.jpg
+ − images/people/aisulu_main.jpg
+ − images/people/anna_hover.jpg
+ − images/people/anna_main.jpg
+ − images/people/ashley_hover.jpg
+ − images/people/ashley_main.jpg
+ − images/people/camilo_hover.jpg
+ − images/people/eric_hover.jpg
+ − images/people/eric_main.jpg
+ − images/people/galen_hover.jpg
+ − images/people/galen_main.jpg
+ − images/people/heather_hover.jpg
+ − images/people/heather_main.jpg
+ − images/people/mary_hover.jpg
+ − images/people/mary_main.jpg
+ − images/people/minsik_hover.jpg
+ − images/people/minsik_main.jpg
+ − images/people/pratibha_hover.jpg
+ − images/people/pratibha_main.jpg
+ − images/people/rain_hover.jpg
+ − images/people/rain_main.jpg
+ − images/people/tim_hover.jpg
+0 −22 our-work/collaborations/acadia.yml
+0 −2 our-work/collaborations/aer.yml
+0 −19 our-work/collaborations/biomed.yml
+7 −7 our-work/collaborations/bnc.yml
+0 −21 our-work/collaborations/brainerd.yml
+2 −2 our-work/collaborations/braingate.yml
+0 −4 our-work/collaborations/peac.yml
+2 −4 our-work/collaborations/pphc.yml
+6 −2 our-work/collaborations/riddc.yml
+2 −2 our-work/collaborations/serre.yml
+4 −6 our-work/collaborations/tpl.yml
+0 −2 our-work/software/autora.yml
+2 −2 our-work/software/beehive.yml
+0 −15 our-work/software/chamber.yml
+0 −25 our-work/software/honeycomb.yml
+2 −2 our-work/software/materials-db.yml
+3 −5 our-work/software/nb-data-explorer.yml
+0 −18 our-work/software/nlp-syllabi.yml
+0 −15 our-work/software/nmr-web-app.yml
+0 −17 our-work/software/profound.yml
+2 −4 our-work/software/project-portal.yml
+2 −2 our-work/software/provident.yml
+0 −17 our-work/software/signal.yml
+2 −4 our-work/software/titan.yml
+0 −2 our-work/software/xnat-tools.yml
+0 −17 our-work/software/yajima.yml
+0 −19 our-work/workshops-and-talks/how-to-pr.yml
+0 −16 our-work/workshops-and-talks/introduction-to-python.yml
+0 −18 our-work/workshops-and-talks/remote_renderer.yml
+0 −19 our-work/workshops-and-talks/soma.yml
+1 −1 rates.md
+0 −6 schemas/banners-frontmatter.yml
+13 −0 schemas/banners.yml
+3 −8 schemas/collaborations.yml
+2 −10 schemas/software.yml
+3 −6 schemas/workshops-and-talks.yml
+10 −11 services/computing/oscar.md
+1 −1 services/computing/stronghold.md
+0 −15 services/consulting/hardware-purchasing.md
+4 −4 services/file-storage-and-transfer/hibernate.md
+19 −18 storage-tool.yml

0 comments on commit 300cab7

Please sign in to comment.