diff options
| author | Paul <Paul@Pauls-MacBook-Air.local> | 2015-05-12 18:06:34 -0400 |
|---|---|---|
| committer | Paul <Paul@Pauls-MacBook-Air.local> | 2015-05-12 18:06:34 -0400 |
| commit | a95ec2fe0169eed3d626fe2c3c645bfbcf48836d (patch) | |
| tree | ab60232b18df351757e1878bc3ceadc626b9a0af /final/main.tex | |
| parent | a37c1d61e98359879356c0543bb20141386c4429 (diff) | |
| download | econ2099-a95ec2fe0169eed3d626fe2c3c645bfbcf48836d.tar.gz | |
Resolve merge conflict
Diffstat (limited to 'final/main.tex')
| -rw-r--r-- | final/main.tex | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/final/main.tex b/final/main.tex index 108d569..d4e64f1 100644 --- a/final/main.tex +++ b/final/main.tex @@ -300,12 +300,8 @@ price. Then we have: As noted by \citep{yao}, the above mechanism $\M$ has the additional property of being $p$-exclusive, where $p$-exclusivity\footnote{\citep{yao} actually uses the -<<<<<<< HEAD -notation $\beta$-exclusive for the same thing, but use $p$ here to have -======= -notation $\beta$-exclusive for the same thing, but we use $p$ here to have ->>>>>>> 8f545e3ba41dbe4d5b686d4e9311243c94fc9b91 -consistent notations.} is defined as follows: for a vector $p = (p_1,\dots,p_m)$ +notation $\beta$-exclusive for the same thing, but we use $p$ here to have +consistent notation.} is defined as follows: for a vector $p = (p_1,\dots,p_m)$ a mechanism is said to be $p$-exclusive if $x_i = 0$ whenever $p_i > t_i$. This is essentially saying that there is a reserve price for each item. |