X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=folly%2FMerge.h;h=f8d1fc1ea7d86549cb6bf373a7e92d24e8bfee75;hp=775d989b23812b30a320b5df2ab79a03204c40d6;hb=214b26f334d1a06515211918fc4a760ae50e6a33;hpb=321542683a01c3f334047531e9b487f047129775

diff --git a/folly/Merge.h b/folly/Merge.h
index 775d989b..f8d1fc1e 100644
--- a/folly/Merge.h
+++ b/folly/Merge.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,8 +36,7 @@
  * from a.
  */
 
-#ifndef FOLLY_MERGE_H_
-#define FOLLY_MERGE_H_
+#pragma once
 
 #include <algorithm>
 
@@ -82,5 +81,3 @@ OutputIt merge(InputIt1 first1, InputIt1 last1,
 }
 
 }
-
-#endif