ugh -- what have i done. maybe this will fix it.
Roger Dingledine commited on 2015-05-05 05:10:57
Zeige 1 geänderte Dateien mit 0 Einfügungen und 4 Löschungen.
- press/en/info.wmi 52968ffbe..9c9e307f4
| ... | ... |
@@ -7,12 +7,8 @@ |
| 7 | 7 |
<h2 class="media">Press Contact</h2> |
| 8 | 8 |
<p> |
| 9 | 9 |
<b>Tor Press Team</b><br> |
| 10 |
-<<<<<<< HEAD |
|
| 11 |
- execdir@torproject.org<br> |
|
| 12 |
-======= |
|
| 13 | 10 |
press@torproject.org<br> |
| 14 | 11 |
+1-617-902-0208 |
| 15 |
->>>>>>> 5628d54898b63540d5df3179261a9cdd591fd970 |
|
| 16 | 12 |
</p> |
| 17 | 13 |
</div> |
| 18 | 14 |
<!-- END INFOBLOCK --> |
| 19 | 15 |