Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

This commit is contained in:
Jacques Distler 2010-05-30 13:36:04 -05:00
commit 851b735158
2 changed files with 0 additions and 2 deletions

View file

@ -199,7 +199,6 @@
\newcommand{\conint}{\oint} \newcommand{\conint}{\oint}
\newcommand{\contourintegral}{\oint} \newcommand{\contourintegral}{\oint}
\newcommand{\infinity}{\infty} \newcommand{\infinity}{\infty}
\renewcommand{\empty}{\emptyset}
\newcommand{\bottom}{\bot} \newcommand{\bottom}{\bot}
\newcommand{\minusb}{\boxminus} \newcommand{\minusb}{\boxminus}
\newcommand{\plusb}{\boxplus} \newcommand{\plusb}{\boxplus}

View file

@ -1217,7 +1217,6 @@ class WikiControllerTest < ActionController::TestCase
\newcommand{\conint}{\oint} \newcommand{\conint}{\oint}
\newcommand{\contourintegral}{\oint} \newcommand{\contourintegral}{\oint}
\newcommand{\infinity}{\infty} \newcommand{\infinity}{\infty}
\renewcommand{\empty}{\emptyset}
\newcommand{\bottom}{\bot} \newcommand{\bottom}{\bot}
\newcommand{\minusb}{\boxminus} \newcommand{\minusb}{\boxminus}
\newcommand{\plusb}{\boxplus} \newcommand{\plusb}{\boxplus}