diff options
| author | Gustav Eek <gustav@fripost.org> | 2015-03-02 20:17:45 +0100 |
|---|---|---|
| committer | Gustav Eek <gustav@fripost.org> | 2015-03-02 20:17:45 +0100 |
| commit | fe12842374a257c03c7210ae9fddfdafe5cb79d7 (patch) | |
| tree | 5c9062e62c8cec3b4052fc5544d8d3af975fbe74 /2014/Makefile | |
| parent | 6fab3cb421b68d419193490a6bcc122290866013 (diff) | |
| parent | 22eec5d6ac3b064d43f7ffba05eb0b5819532a4f (diff) | |
Merge branch 'annual-mar-29', minutes from annual meeting 2014
Conflicting '2014/Makefile' was resolved
Diffstat (limited to '2014/Makefile')
| -rw-r--r-- | 2014/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/2014/Makefile b/2014/Makefile index 3bc2a5b..675f15d 100644 --- a/2014/Makefile +++ b/2014/Makefile @@ -1,7 +1,8 @@ # Makefile for minutes of 2014 MINUTES = 2014-02-11-board \ -2014-02-24-board +2014-02-24-board \ +2014-03-29-annual common-makefile = ../resources/Makefile-common |