Add proper gitignore, remove unnecessary files.

maellak · Oct 24, 2014 · 189df7f · 189df7f
1 parent 44ec68e
commit 189df7f
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 62 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,17 +1,15 @@
-syntax: regexp
-
-^\.htaccess$
-
-^courses/
-^video/
-^config/.*\.php
-^html/
-
-^nbproject/private/
-
-^\.buildpath$
-^\.project$
-^\.settings$
-^\.htaccess$
-syntax: glob
-include\main_lib.php.orig
+courses/
+video/
+config/*.php
+html/
+nbproject/private/
+.htaccess
+.buildpath
+.project
+.settings
+.orig/
+.orig
+.chg/
+.rej
+.conflict
+.map
diff --git a/.hgignore b/.hgignore
diff --git a/courses/commondocs/index.htm b/courses/commondocs/index.htm
diff --git a/courses/index.htm b/courses/index.htm
diff --git a/courses/temp/index.htm b/courses/temp/index.htm
diff --git a/courses/userimg/index.htm b/courses/userimg/index.htm
diff --git a/student_view.php b/student_view.php
diff --git a/video/index.htm b/video/index.htm