Commit | Line | Data |
---|---|---|
1f3323ce VB |
1 | --- ./common/autoconf/generated-configure.sh 2017-05-12 23:47:56.000000000 +0530 |
2 | +++ ../generated-configure.sh 2017-05-13 10:06:09.764530254 +0530 | |
3 | @@ -5195,13 +5195,7 @@ | |
4 | #CUSTOM_AUTOCONF_INCLUDE | |
5 | ||
6 | # Do not change or remove the following line, it is needed for consistency checks: | |
7 | -<<<<<<< variant A | |
8 | -DATE_WHEN_GENERATED=1493303684 | |
9 | ->>>>>>> variant B | |
10 | DATE_WHEN_GENERATED=1493884285 | |
11 | -####### Ancestor | |
12 | -DATE_WHEN_GENERATED=1492975963 | |
13 | -======= end | |
14 | ||
15 | ############################################################################### | |
16 | # |