resolved merge conflict
This commit is contained in:
commit
030fa044e9
45 changed files with 12402 additions and 314 deletions
|
@ -1,4 +1,4 @@
|
|||
{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
|
||||
{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
|
||||
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
|
||||
{\colortbl;\red255\green255\blue255;}
|
||||
\viewkind0
|
||||
|
@ -16,7 +16,7 @@
|
|||
|
||||
\b Documentation:
|
||||
\b0 \
|
||||
http://github.com/jeena/bungloo/wiki\
|
||||
http://jabs.nu/bungloo\
|
||||
\
|
||||
|
||||
\b With special thanks to:
|
||||
|
|
Reference in a new issue