Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4b6d18d authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

resolved conflicts for merge of ab5b8603 to master

Change-Id: I857725640bc77f04d93f04c52efc73335122e5ea
parents e29cbd33 ab5b8603
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -486,7 +486,8 @@ static void dump_log_file(
    entry = &log_entry.entry_v1;

    if (first) {
      _LOG(log, logtype::HEADER, "--------- %slog %s\n", tail ? "tail end of " : "", filename);
      _LOG(log, logtype::LOGS, "--------- %slog %s\n",
        tail ? "tail end of " : "", filename);
      first = false;
    }