Fix merge conflict

ocaml-bench · Dec 3, 2019 · 93738dc · 93738dc
2 parents 6c51760 + 28b1a0a
commit 93738dc
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,26 @@
 _build
 orun.install
+=======
+*.annot
+*.cmo
+*.cma
+*.cmi
+*.a
+*.o
+*.cmx
+*.cmxs
+*.cmxa
+
+# ocamlbuild working directory
+_build/
+
+# ocamlbuild targets
+*.byte
+*.native
+
+# oasis generated files
+setup.data
+setup.log
+
+# Merlin configuring file for Vim and Emacs
 .merlin
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+# orun
+orun is a benchmarking tool that gives you runtime and OCaml garbage collector statistics.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# orun
		orun is a benchmarking tool that gives you runtime and OCaml garbage collector statistics.