fix contributing.md

Shahak Yosef · Shahak Yosef · commit deda684e54a1 · 2020-02-10T09:32:24.000+02:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -58,14 +58,11 @@ The build and tests use webpack to compile all the source modules into one bundl
 ## Running the demo
 Navigate to `/demo` directory
 
-<<<<<<< HEAD
-=======
 Install npm dependencies:
 ```
 npm install
 ```
 
->>>>>>> powerbi/master
 Serve the demo directory:
 ```
 npm start
