Skip to content

Commit 8f7a79b

Browse files
author
Zishan Mirza
committed
format code with clang-format
1 parent 3a546c1 commit 8f7a79b

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

libc/src/time/linux/localtime.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "src/time/linux/localtime_utils.h"
109
#include "src/time/localtime.h"
10+
#include "src/time/linux/localtime_utils.h"
1111
#include "src/time/time_utils.h"
1212

1313
namespace LIBC_NAMESPACE_DECL {

libc/src/time/linux/timezone.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include <unistd.h>
1212

1313
#include "src/__support/common.h"
14-
#include "src/time/time_utils.h"
1514
#include "src/time/linux/timezone.h"
15+
#include "src/time/time_utils.h"
1616

1717
namespace LIBC_NAMESPACE_DECL {
1818
namespace timezone {

libc/test/src/time/ctime_r_test.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,18 @@
88

99
#include "src/__support/File/file.h"
1010
#include "src/errno/libc_errno.h"
11+
#include "src/time/ctime_r.h"
1112
#include "src/time/linux/localtime_utils.h"
1213
#include "src/time/linux/timezone.h"
14+
<<<<<<< HEAD
1315
#include "src/time/ctime_r.h"
1416
#include "src/time/time_constants.h"
1517
#include "src/time/time_utils.h"
1618
#include "src/time/timezone.h"
19+
||||||| parent of 3d1dc2e7b1ea (format code with clang-format)
20+
#include "src/time/ctime_r.h"
21+
=======
22+
>>>>>>> 3d1dc2e7b1ea (format code with clang-format)
1723
#include "test/UnitTest/Test.h"
1824
#include "test/src/time/TmHelper.h"
1925

0 commit comments

Comments
 (0)