moparisthebest
/
Simba
mirror of https://github.com/moparisthebest/Simba
1
0
Fork 0
Code Issues Releases Wiki Activity

Documentation: Fix merge gone wrong.

This commit is contained in:
Merlijn Wajer 2011-08-04 01:25:21 +02:00
parent 9b3694f105
commit d61e79a528
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Doc/sphinx/libmml/intro.rst
View File

@ -59,8 +59,6 @@ write - again - their own wrapper around libMML. This is what is being done with
*pyMML*, the python libMML wrapper. It is still as much in development as libMML
is, but the functionality exposed by libMML is succesfully used.
<<<<<<< HEAD
=======
As of writing the pyMML usage looks like this, the passing around of a client
may be removed in a later stage, or at least have it's behaviour changed.
@ -100,4 +98,3 @@ may be removed in a later stage, or at least have it's behaviour changed.
print m.getPos()
del DLL
>>>>>>> master