Skip to content
This repository
Browse code

Merging conflicts

  • Loading branch information...
commit 6ba77a51b6abf9a73a4cbad6afc972cf834e59c8 1 parent f546f1e
Boopathi Rajaa authored December 07, 2012

Showing 1 changed file with 0 additions and 4 deletions. Show diff stats Hide diff stats

  1. 4  README.md
4  README.md
Source Rendered
... ...
@@ -1,15 +1,11 @@
1 1
 # Wordfs webapp
2 2
 
3  
-<<<<<<< HEAD
4 3
 A wordfs webapp - Find words from a matrix in a dfs fashion.
5 4
 
6 5
 # NOTE: Important for developers
7 6
 
8 7
 + Part of the source code is maintained as a seperate branch "pack-for-npm". 
9 8
 + The reason for doing this is "Packaging the source cpp modules" as a library. So one can just include "require('wordfs')".
10  
-=======
11  
-A wordfs webapp - Find words from a matrix in a dfs fashion. 
12  
->>>>>>> 49fd9dac6069c1161caf76892f7685e4bcd939ea
13 9
 
14 10
 # Installation
15 11
 

0 notes on commit 6ba77a5

Please sign in to comment.
Something went wrong with that request. Please try again.