readme conflict resolved
This commit is contained in:
		
						commit
						4c16afebf9
					
				| @ -20,6 +20,7 @@ The following generates a sample page `result.html`. | ||||
| 
 | ||||
| Using `make` is uptional; it does the following within a new directory: | ||||
| 
 | ||||
|     cp example/settings.toml ./settings.toml | ||||
|     cp example/timeline.css ./timeline.css | ||||
|     cp example/default.tpl ./template.tpl | ||||
|     cp example/demo.txt ./content.txt | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user