corrected README

smoge · Nov 20, 2011 · eb76b21 · eb76b21
1 parent b9da8f7
commit eb76b21
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -9,14 +9,15 @@ See fomus.scd for some examples.
 Website
 -------
 
-<<<<<<< HEAD
-		https://github.com/smoge/superfomus
-=======
+    https://github.com/smoge/superfomus
+
+
+------------------------------------------------------------
+
 This project is hosted here:
 
-git clone git://github.com/smoge/superfomus.git SuperFomus
+    git clone git://github.com/smoge/superfomus.git SuperFomus
 
->>>>>>> parent of 1d6ad6c... better README
 
 Dependencies
 ------------
@@ -36,8 +37,8 @@ Links
 Usage
 =====
 
-You can include Events, Array of Events and Streams.
-This means that you can generate your data as Events:
+You can include Events, Array of Events and Streams. This means that
+you can generate your data as Events:
 
 
 		[
@@ -47,7 +48,8 @@ This means that you can generate your data as Events:
 		]
 
 
-Or... you can create a Pattern, turn it into a Stream, and specify how many events should be created by this Stream
+Or... you can create a Pattern, turn it into a Stream, and specify how
+many events should be created by this Stream
 
 		put(Stream, number-of-elements)
 
@@ -124,7 +126,5 @@ Another example:
 		f.ly
 		f.midi
 		f.xml
-=======
-
->>>>>>> parent of 1d6ad6c... better README
-
+        
+        
diff --git a/tests.scd b/tests.scd
@@ -1,4 +1,4 @@
-
+0
 s.boot
 
 p = Pbind(