Fix another tiny merge conflict
hiro commited on 2018-08-10 19:13:52
Zeige 1 geänderte Dateien mit 0 Einfügungen und 1 Löschungen.
- press/en/press.wml 6a259c12c..70cf25eef
| ... | ... |
@@ -81,7 +81,6 @@ took a huge step towards controlling all access to the Internet</a></td> |
| 81 | 81 |
</tr> |
| 82 | 82 |
|
| 83 | 83 |
<tr style="background-color: #e5e5e5;"> |
| 84 |
->>>>>>> ea87dd7c810e074e6f5c3bd659ff9f58d45da108 |
|
| 85 | 84 |
<td>2018 May 30</td> |
| 86 | 85 |
<td>ZDNet</td> |
| 87 | 86 |
<td><a href="https://www.zdnet.com/article/technology-that-changed-us-the-2000s/">Technology that changed us: The 2000s, from iPhone to Twitter</a></td> |
| 88 | 87 |