projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
struct/class consistency
[folly.git]
/
folly
/
Merge.h
diff --git
a/folly/Merge.h
b/folly/Merge.h
index 6598c682535a764c6c39c060811e121d4fc39667..7e92c02905cfc2672a13e1037e36aa13bf7d60d9 100644
(file)
--- a/
folly/Merge.h
+++ b/
folly/Merge.h
@@
-1,5
+1,5
@@
/*
- * Copyright 201
4
Facebook, Inc.
+ * Copyright 201
5
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.