Commit c4fe32da586f5eced64571de44efeb704a12b562

Authored by matyapiro31
1 parent 2fe5b768

fix merge upstream.

Showing 1 changed file with 0 additions and 1 deletions
README.md
... ... @@ -84,7 +84,6 @@ Thrift and statically link it. This should be convenient for people using one of
84 84 distributions that do not package Thrift.
85 85  
86 86 You can also install the plugin for your user only by replacing `install` with `user-install`.
87   ->>>>>>> a081c15148e8ae0d8149dadd8aad85b1c266362c
88 87  
89 88 Features implemented
90 89 --------------------
... ...