This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merging conflicts

  • Loading branch information...
boopathi committed Dec 6, 2012
1 parent f546f1e commit 6ba77a51b6abf9a73a4cbad6afc972cf834e59c8
Showing with 0 additions and 4 deletions.
  1. +0 −4 README.md
View
@@ -1,15 +1,11 @@
# Wordfs webapp
-<<<<<<< HEAD
A wordfs webapp - Find words from a matrix in a dfs fashion.
# NOTE: Important for developers
+ Part of the source code is maintained as a seperate branch "pack-for-npm".
+ The reason for doing this is "Packaging the source cpp modules" as a library. So one can just include "require('wordfs')".
-=======
-A wordfs webapp - Find words from a matrix in a dfs fashion.
->>>>>>> 49fd9dac6069c1161caf76892f7685e4bcd939ea
# Installation

0 comments on commit 6ba77a5

Please sign in to comment.