diff options
| author | Christian Franke <nobody@nowhere.ws> | 2012-02-03 02:06:37 +0100 |
|---|---|---|
| committer | Christian Franke <nobody@nowhere.ws> | 2012-02-03 02:06:37 +0100 |
| commit | c1fe26e9c3a1f6d26ff5b653150deacf56c45b7c (patch) | |
| tree | 0eeefc08367387fb64689607cacd2ebf3ae9c1b0 /template/pages/verein | |
| parent | 5826a58c7c3ca812f409663c30d46ff5b125957d (diff) | |
Revert "Merge branch 'master' of sublab.org:website"
This reverts commit 76f5eb72cda67da497ea4ba992778661559f26b4, reversing
changes made to 002ccb53e6319619d503972c2a6bad0d4ead0c6f.
Conflicts:
template/topic/topic
Guys, please learn how to use git. Have a look at
$ git diff origin/master master
and check if it looks reasonable. Also, if there is a merge in the
history, in our case, it is almost always bad. When you pull, use
$ git pull --rebase --ff-only
and not just a pull without arguments.
Diffstat (limited to 'template/pages/verein')
| -rw-r--r-- | template/pages/verein/content.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/template/pages/verein/content.html b/template/pages/verein/content.html index 03adffd..549d35e 100644 --- a/template/pages/verein/content.html +++ b/template/pages/verein/content.html @@ -46,10 +46,6 @@ Wenngleich wir bemüht sind die Strukturen flach zu halten bringt so ein juristi <a href="inc/sublab_ev_satzung.pdf">Vereinssatzung</a><br> <a href="inc/sublab_ev_geschaeftsordnung.pdf">Geschäftsordnung</a><br> <a href="inc/sublab_ev_geldspendenquittung.pdf">Geldspendenquittung</a><br> -<<<<<<< HEAD -<a href="inc/sublab_ev_sachspendenquittung.pdf">Sachspendenquittung</a> -======= <a href="inc/sublab_ev_sachspendenquittung.pdf">Sachspendenquittung</a><br> <a href="inc/sublab_ev_einzugsermaechtigung.pdf">Einzugsermächtigung</a> ->>>>>>> 002ccb53e6319619d503972c2a6bad0d4ead0c6f </p> |