remove conflict marker

Summary: title. Reviewed By: jacobkahn Differential Revision: D13563317 fbshipit-source-id: b72cf92412cfc73b1fa37901c45506d746d67ffa
jercylew · Jan 2, 2019 · 7573eba · 7573eba
1 parent 707d2c1
commit 7573eba
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -108,8 +108,6 @@ Building on Windows
 -------------------
 Building flashlight on Windows is not supported at this time (coming soon).
 
-<<<<<<< dest:   2072563d0e47 - ksenks: [DataFetch] Example of Query Fragment ...
-
 Building/Running flashlight with Docker
 ---------------------------------------
 flashlight and its dependencies can also be built with the provided Dockerfile. Only the CUDA backend is supported with Docker at this time.