Changeset d6bc9901 in sasview for .gitignore

Timestamp:

Sep 21, 2017 4:22:47 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

948484f

Parents:

b4cd56e

Message:

git ignore node modules installer for katex/mathjax prerendering

File:

• .gitignore (modified) (1 diff)

.gitignore

@@ -36 +36 @@
 /docs/sphinx-docs/source/user/guiframe
 /docs/sphinx-docs/source/user/models
+<<<<<<< Updated upstream
 /docs/sphinx-docs/source/user/perspectives
 /docs/sphinx-docs/source/user/sasgui
 /docs/sphinx-docs/katex*.zip
+=======
+/docs/sphinx-docs/source/user/sasview
+/docs/sphinx-docs/source/user/perspectives
+/docs/sphinx-docs/katex*.zip
+/docs/sphinx-docs/node_modules
+/docs/sphinx-docs/node-package.json
+>>>>>>> Stashed changes
 
 # test outputs