ucsb-cs156 / proj-happycows

https://ucsb-cs156.github.io/proj-happycows/
1 stars 0 forks source link

Pc do not merge test integration of w24 with a ps stuff #108

Closed pconrad closed 6 months ago

pconrad commented 6 months ago

This DRAFT PR (do not merge!) is just a reality check on whether we will run into problems if/when we merge both the w24-4pm-2 branch and the ap-integration branch.

The purpose is to see if there were merge conflicts (there were not) and to see what happens on CI,