[gjs] coverage: Fix leftover from rebase
- From: Sam Spilsbury <samspilsbury src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs] coverage: Fix leftover from rebase
- Date: Tue, 23 Jun 2015 17:11:07 +0000 (UTC)
commit 97b37c6b096c3d8517a36276010e4620076e510f
Author: Sam Spilsbury <smspillaz gmail com>
Date: Wed Jun 17 18:48:08 2015 +0800
coverage: Fix leftover from rebase
gjs/coverage-internal.h | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/gjs/coverage-internal.h b/gjs/coverage-internal.h
index 7d8629a..19c9316 100644
--- a/gjs/coverage-internal.h
+++ b/gjs/coverage-internal.h
@@ -28,8 +28,6 @@
#include "jsapi-util.h"
#include "coverage.h"
-<<<<<<< HEAD
-=======
GArray * gjs_fetch_statistics_from_js(GjsCoverage *coverage,
char **covered_paths);
GBytes * gjs_serialize_statistics(GjsCoverage *coverage);
@@ -37,15 +35,12 @@ GBytes * gjs_serialize_statistics(GjsCoverage *coverage);
JSString * gjs_deserialize_cache_to_object(GjsCoverage *coverage,
GBytes *cache_bytes);
->>>>>>> be464c0... coverage: Serialize statistics to cache-path on cache misses
gboolean gjs_run_script_in_coverage_compartment(GjsCoverage *coverage,
const char *script);
gboolean gjs_inject_value_into_coverage_compartment(GjsCoverage *coverage,
JS::HandleValue value,
const char *property);
-<<<<<<< HEAD
-=======
gboolean gjs_get_path_mtime(const char *path,
GTimeVal *mtime);
gchar * gjs_get_path_checksum(const char *path);
@@ -53,7 +48,6 @@ gchar * gjs_get_path_checksum(const char *path);
gboolean gjs_write_cache_to_path(const char *path,
GBytes *cache_bytes);
->>>>>>> be464c0... coverage: Serialize statistics to cache-path on cache misses
extern const char *GJS_COVERAGE_CACHE_FILE_NAME;
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]