projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
2017
[folly.git]
/
folly
/
test
/
MergeTest.cpp
diff --git
a/folly/test/MergeTest.cpp
b/folly/test/MergeTest.cpp
index ae0693b1532ea5b752d0587a948f36ce054386ce..16e23e1c919862f08c317f280ffaab48fce8f467 100644
(file)
--- a/
folly/test/MergeTest.cpp
+++ b/
folly/test/MergeTest.cpp
@@
-1,5
+1,5
@@
/*
- * Copyright 201
6
Facebook, Inc.
+ * Copyright 201
7
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.