Permalink
Browse files

Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	Bats/src/Bats.java
  • Loading branch information...
2 parents 8b9a242 + 74d576a commit 7824ba31e322675771c43734ad5091c0822a70c0 @wackerl committed May 10, 2012
Showing with 7 additions and 3 deletions.
  1. +1 −1 Bats/settings/C14/calib.xml
  2. +1 −1 Bats/settings/C14/isotope.xml
  3. +1 −1 Bats/settings/general.xml
  4. +4 −0 Bats/src/Bats.java
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<calib date="Wed May 09 22:11:38 CEST 2012" version="3.3 (9.5.2012)">
+<calib date="Thu May 10 11:43:10 CEST 2012" version="3.3 (9.5.2012)">
<oxcal active="0">file:///Applications/OxCal/oxcal/OxCalPlot.html</oxcal>
<label>commentinfo</label>
<bp>false</bp>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<isotope date="Wed May 09 22:11:38 CEST 2012" version="3.3 (9.5.2012)">
+<isotope date="Thu May 10 11:43:10 CEST 2012" version="3.3 (9.5.2012)">
<path>/Users/lukas/bats</path>
<!--settings for isotope specific (C14) calculations-->
<calc>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<general date="Wed May 09 22:11:38 CEST 2012" version="3.3 (9.5.2012)">
+<general date="Thu May 10 11:43:10 CEST 2012" version="3.3 (9.5.2012)">
<frame>
<main>
<width>1540</width>
View
@@ -1,5 +1,9 @@
/*
+<<<<<<< HEAD
* Bats.java ***
+=======
+ * Bats.java
+>>>>>>> refs/remotes/choose_remote_name/master
*
*
*/

0 comments on commit 7824ba3

Please sign in to comment.