mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-03-03 06:06:24 +00:00
ec9fcce3c6
Monotone-Parent: 618ad1eb6b0c707afbfd6673022c7840209747e1 Monotone-Revision: b59f331214320317bf10c70f2db10187fcd5f29d Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2010-08-19T13:48:53
14 lines
205 B
Plaintext
14 lines
205 B
Plaintext
# Version file
|
|
|
|
<<<<<<< variant A
|
|
SUBMINOR_VERSION:=1
|
|
|
|
# v0.9.1 requires Main v0.9.59
|
|
>>>>>>> variant B
|
|
SUBMINOR_VERSION:=1
|
|
####### Ancestor
|
|
SUBMINOR_VERSION:=0
|
|
|
|
# v0.9.1 requires Main v0.9.59
|
|
======= end
|