Removing zencoder from .gitignore #PA-2.

diff --git a/.gitignore b/.gitignore
index 611b31b79e52338d2cab6ff5b3311d830a15db6d..ce74ae49c8876b4bb519cb45b8736c468a52f050 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 node_modules/
 pm2logs/
 **/.DS_Store/
-.zencoder/
 logs/
 bin/
\ No newline at end of file

diff --git a/.idea/phs-api.iml b/.idea/phs-api.iml
index 6df7ca54584d4e759edde918d8ba6b0e2e59d6df..3194328fd1b917508293008d9cc9ea97b872a32a 100755 (executable)
--- a/.idea/phs-api.iml
+++ b/.idea/phs-api.iml
@@ -9,6 +9,7 @@
       <excludeFolder url="file://$MODULE_DIR$/bin" />
       <excludeFolder url="file://$MODULE_DIR$/pm2logs" />
       <excludeFolder url="file://$MODULE_DIR$/logs" />
+      <excludeFolder url="file://$MODULE_DIR$/.idea/dataSources" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />