Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1419597 - Part 19: Remove accidental version control marker on a CLOSED TREE, a=bustage

Browse Source 
MozReview-Commit-ID: LuztkGycks1
This commit is contained in:
Nika Layzell 2017-11-23 13:43:41 -05:00
parent fc2d7ac38d
commit 8886a24cd7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/nsGlobalWindowInner.cpp
View File

@ -278,7 +278,7 @@ class nsIScriptTimeoutHandler;
#else
#include <unistd.h> // for getpid()
#endif
>>>>>>> 17303795bff5... Bug 1419597 - Part 10: Move includes into nsGlobalWindow{Inner,Outer}.cpp, r=smaug
using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::dom::ipc;