Fixing conflicts

didn't see conflicts noted

Fixing conflicts
didn't see conflicts noted
9aa2e2a1 · Mark Hoeber · 05dac894 · 9aa2e2a1
Commit 9aa2e2a1 authored Dec 12, 2013 by Mark Hoeber
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

docs/course_authors/source/common_problems.rst
+2 -2

No files found.
--- a/docs/course_authors/source/common_problems.rst
+++ b/docs/course_authors/source/common_problems.rst
 .. _Common Problems:

-#############################
+############################
 Common Problems
-#############################
+############################

 *Common problems* are typical problems such as multiple choice problems
 and other problems whose answers are simple for students to select or