Skip to content

Commit 855587a

Browse files
committed
Merge branch 'phase2' of github.com:hamogu/project into phase2
2 parents bda2a4c + f18ad79 commit 855587a

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

finance/proposal-calls/Moore_2021.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ Examples of constructive comments are
4949

5050
If you are worried about your comments being construed as non-constructive, you are welcome to send your feedback directly to the Finance Committee at [email protected] or ask on Slack. You are also welcome to use the “thumbs down” vote without adding comments. If you have any concerns about this process and the ensuing discussion that you would prefer to discuss privately, contact Ombudsperson at [email protected].
5151

52-
5352
### Voting and decision
54-
Voting is done by simply adding a "thumps up" to the project PR. Any number of projects can be voted up by a single person. Projects are ranked by number of "thumbs up". The finance commitee reserves the right to discount "thumbs up" from github accounts without any contributions to Astropy repositories.
53+
Voting is done by simply adding a "thumbs up" to the project PR. Any number of projects can be voted up by a single person. Projects are ranked by number of "thumbs up". The finance commitee reserves the right to discount "thumbs up" from github accounts without any contributions to Astropy repositories.
5554

5655
The CoCo and the Finance Committee will select projects following the ranking taking into account the requirements of the available grant funding (e.g. if none of the highest ranking projects deals with spectroscopy, this money reserved for spectroscopy can be awarded to the highest ranking spectroscopy project, even if that means that other, higher ranked projects won't be executed).
5756

@@ -85,4 +84,4 @@ currency: US $
8584

8685
Include overheads, fringe etc. if money is paid as sub-grant (note that the Moore grant caps overhead at 15%).
8786

88-
Include all costs (travel, work, conference registrations etc.)
87+
Include all costs (travel, work, conference registrations etc.)

0 commit comments

Comments
 (0)