Skip to content

Conversation

@RebeccaHager
Copy link
Collaborator

No description provided.

Kaminssj and others added 8 commits March 13, 2022 16:48
commit 2449c03
Author: Kaminssj <92740287+Kaminssj@users.noreply.github.com>
Date:   Sun Mar 13 16:47:20 2022 -0400

    Merging work

commit 877a41d
Merge: 0cfbcdc 2301551
Author: Kaminssj <92740287+Kaminssj@users.noreply.github.com>
Date:   Sun Mar 13 10:14:24 2022 -0400

    Merge branch 'towers-in-the-soup' of https://github.com/Unit26Y21/DesignAnarchy into towers-in-the-soup

commit 0cfbcdc
Author: Kaminssj <92740287+Kaminssj@users.noreply.github.com>
Date:   Sun Mar 13 10:14:08 2022 -0400

    coordinating carpark code with other rates

commit 2301551
Merge: dd60c76 25ec2ed
Author: kkenny000 <92530883+kkenny000@users.noreply.github.com>
Date:   Fri Mar 11 14:30:04 2022 -0500

    Projected Proceeds

    updated code to combine all functions for commercial, residential and manufacturing proceeds

commit dd60c76
Author: kkenny000 <92530883+kkenny000@users.noreply.github.com>
Date:   Tue Mar 8 10:53:41 2022 -0500

    Manufacturing Code and Coffee edits

commit 25ec2ed
Author: Kaminssj <92740287+Kaminssj@users.noreply.github.com>
Date:   Mon Mar 7 20:41:19 2022 -0500

    Other Rates Pro Forma Code

commit ca6b5bc
Merge: 8717f74 4d4be3d
Author: Kaminssj <92740287+Kaminssj@users.noreply.github.com>
Date:   Mon Mar 7 19:14:37 2022 -0500

    Merge branch 'towers-in-the-soup' of https://github.com/Unit26Y21/DesignAnarchy into towers-in-the-soup

commit 8717f74
Author: Kaminssj <92740287+Kaminssj@users.noreply.github.com>
Date:   Mon Mar 7 19:13:55 2022 -0500

    proforma updates

commit 4d4be3d
Author: kkenny000 <92530883+kkenny000@users.noreply.github.com>
Date:   Mon Mar 7 14:03:34 2022 -0500

    Manufacturing Py Files

    initial edits

commit 56056be
Author: kkenny000 <92530883+kkenny000@users.noreply.github.com>
Date:   Mon Mar 7 11:13:26 2022 -0500

    Manufacturing Constants

commit 1c87701
Author: Kaminssj <92740287+Kaminssj@users.noreply.github.com>
Date:   Sun Feb 27 14:15:01 2022 -0500

    proforma update

commit c2346e3
Author: Kaminssj <92740287+Kaminssj@users.noreply.github.com>
Date:   Sat Feb 26 09:09:59 2022 -0500

    Added conditional statements for user input

commit e2d9779
Author: Kaminssj <92740287+Kaminssj@users.noreply.github.com>
Date:   Thu Feb 24 23:49:16 2022 -0500

    creating environment for Pro Forma
tested pushing
Updated what the components are named
I didnt want to lose this but I dont know what it is
practice on my branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants