Conflict resolution
tree9f7c3e45011a6c7948a5fe3950b8314d0fa1d366
-rw-r--r-- 702 .gitignore
-rw-r--r-- 0 AUTHORS
-rw-r--r-- 0 COPYING
-rw-r--r-- 0 ChangeLog
-rw-r--r-- 0 INSTALL
-rw-r--r-- 743 Makefile.am
-rw-r--r-- 0 NEWS
-rw-r--r-- 0 README
-rwxr-xr-x 45153 autogen.sh
drwxr-xr-x - bindings
drwxr-xr-x - conf
drwxr-xr-x - config
-rw-r--r-- 1119 configure.in
drwxr-xr-x - debian
drwxr-xr-x - doc
-rw-r--r-- 24331 elliptics-bf.spec
drwxr-xr-x - example
drwxr-xr-x - include
drwxr-xr-x - library
drwxr-xr-x - srw