summaryrefslogtreecommitdiffabout
path: root/README
authorSergey Poznyakoff <gray@gnu.org.ua>2017-08-05 17:25:17 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2017-08-05 17:25:17 (GMT)
commit31cb248e3676c807c96e733bf0b70e3fa26ac3c4 (patch) (side-by-side diff)
treeaa56be3b3129c8bfba769cfc9ec763ee3b1f9b69 /README
parent69753cada1bafd8c706521a8e39e6302e751d424 (diff)
downloadvmod-dbrw-31cb248e3676c807c96e733bf0b70e3fa26ac3c4.tar.gz
vmod-dbrw-31cb248e3676c807c96e733bf0b70e3fa26ac3c4.tar.bz2
Fix README
Diffstat (limited to 'README') (more/less context) (ignore whitespace changes)
-rw-r--r--README14
1 files changed, 0 insertions, 14 deletions
diff --git a/README b/README
index a3d3ffc..a741783 100644
--- a/README
+++ b/README
@@ -93,7 +93,6 @@ The VCL code differs only in the call to dbrw.config in vcl_recv:
In order to compile the package you need to have installed
varnishd and varnishapi package.
-<<<<<<< HEAD
Supposing that condition is met, run:
@@ -105,19 +104,6 @@ important one is PKG_CONFIG_PATH, which contains a path (in the UNIX sense)
where the .pc files are located. It should contain a directory where the
'varnishapi.pc' file lives. Example usage:
-=======
-
-Supposing that condition is met, run:
-
- ./configure
-
-It should be able to automatically find the necessary components. In case
-it doesn't, tweak the configuration variables as necessary. The most
-important one is PKG_CONFIG_PATH, which contains a path (in the UNIX sense)
-where the .pc files are located. It should contain a directory where the
-'varnishapi.pc' file lives. Example usage:
-
->>>>>>> e0e3166a8bbe666414c2f0ee9c732f6254acf550
./configure PKG_CONFIG_PATH=/usr/local/varnish/lib/pkgconfig:$PKG_CONFIG_PATH
Please read the file INSTALL for a detailed discussion of available variables

Return to:

Send suggestions and report system problems to the System administrator.