Merge pull request openwebwork#10 from djun-kim/master

Minor changes to try out pull requests
aubreyja · Jun 14, 2012 · d004c10 · d004c10
2 parents acbf2b1 + 3799604
commit d004c10
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 1,903 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,11 @@
 .svn
 .DS_Store
 .*
+*~
 *.save
 htdocs/tmp/*
 tmp/*
 logs/*
 conf/*.conf
 conf/*.apache2-config
-courses.dist/*
+courses.dist/*
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker2.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker2.pm
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm